Including search results in main page
We now have Live-Results ;)
Merge branch 'master' of github.com:Jugendhackt/apartmapp

Conflicts:
	frontend/app/scripts/controllers/main.js
	frontend/app/scripts/controllers/main.js~
	frontend/app/views/main.html
	frontend/app/views/main.html~