123
Merge branch 'leaflat' of github.com:Jugendhackt/apartmapp into leaflat
jslint
move the map up to the top

otherwise the result list hides it
include the map in the results page
Merge branch 'master' into leaflat

Conflicts:
	frontend/app/scripts/controllers/main.js
	frontend/app/views/main.html
Merge pull request #3 from Jugendhackt/leaflat

Leaflat include, thanks tomster