fix device page
Merge branch 'master' of github.com:CooledCoffee/atlantis

Conflicts:
	src/atlantis/templates/device.html