add search page
Merge branch 'master' of github.com:dm4/AnnonaPK

Conflicts:
	web/app.js
Merge branch 'master' of github.com:dm4/AnnonaPK