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
map shit
chat client UI functional
doin stuff
Merge pull request #11 from pietdaniel/backbone-setup

chat client UI functional
Merge remote-tracking branch 'origin/master' into clean-up