ESTIMOTE-6 Improved room response
https://dotcreek.atlassian.net/browse/ESTIMOTE-6
Return RESTFull information on GET /rooms or /rooms/:id
Merge branch 'dev' of github.com:dotcreek/DCEestimote into dev

Conflicts:
	backend/app/controllers/rooms.js