Added type and country to result page.
Merge branch 'master' of https://github.com/andrewpw/surferpedia

Conflicts:
	conf/evolutions/default/1.sql