Minor changes
Merge branch 'master' of github.com:paanil/UNdataMap

Conflicts:
	ServerApplication/templates/index.html