fix spurious 1
Search functionality in angular
Added UI for search
Merge branch 'master' into zoeken

Conflicts:
	src/main/webapp/javascript/routes.js
Merge branch 'zoeken'