Update
Merge branch 'master' of https://github.com/sonton1992/SuperDash

Conflicts:
	views/map.html
	views/notification.html
	views/superdash.html