filtering and persistence not quite working
Merge branch 'master' of github.com:trentio/urbanambassadors
handle merge conflicts
Conflicts:
	src/main/resources/client/projects.html
Merge branch 'master' of github.com:trentio/urbanambassadors