map
Merge branch 'master' of https://github.com/pietdaniel/JAMR into map

Conflicts:
	static/assets/css/custom.css
	static/views/appView.js
Merge pull request #9 from pietdaniel/map

map