routes,page
Merge branch 'surferpedia-updates' of https://github.com/jortal/Surferpedia into surferpedia-updates

Conflicts:
	app/controllers/Application.java