Setup for AJAXing directory object when a room is clicked on the map
Merge branch 'master' of github.com:dssit/dss-wayfinding

Conflicts:
	app/controllers/directory_objects_controller.rb