Map UI
Merge branch 'master' of github.com:TheFuzzy/NTU-CZ3003-CMS

Conflicts:
	backend/storm/data.json
	backend/storm/main/static/Map UI/data.json
	backend/storm/main/static/Map UI/index.html
	backend/storm/main/static/Map UI/maps.js
	backend/storm/main/templates/main/base.html