Update Express routes with new syntax
Merge branch 'master' into basic-search

Conflicts:
	server/routes/api/entries.coffee
Set custom timeout for Search test 'before'