commit local:  mapUI change
Merge branch 'master' of github.com:TheFuzzy/NTU-CZ3003-CMS

Conflicts:
	backend/storm/data.json