Merge branch 'device-bays' of github.com:digitalocean/netbox into device-bays

Conflicts:
	netbox/dcim/tables.py