stuff
Merge branch 'master' of github.com:robwblack/mercury

Conflicts:
	app/controllers/DeviceManager.java