Changed dc to screens and modified sensors to have sensor types.
Merge branch 'master' of https://github.com/zonywhoop/arserver

Conflicts:
	.idea/workspace.xml
	server/app/controllers/HomeController.php