change map control position
hotfix duplicated map
add device edit page
Merge branch 'admin' into dev
;Merge branch 'map' into dev

Conflicts:
	client/src/app/map/map.tpl.html
	client/src/sass/core.sass
test
back to the old day, use account
add playback feature