Merge pull request #2 from robwblack/device_ids

Adding several methods to DeviceManager
initial dashboard
Fixing typos
Merge branch 'master' into device_ids

Conflicts:
	app/controllers/DeviceManager.java