Added bootstrap modal for settings
Merge branch 'master' of github.com:paanil/UNdataMap

Conflicts:
	ServerApplication/static/map3d.js