static content in en.yml
Merge branch 'develop' of github.com:RoelandMatthijssens/lanparty into develop

Conflicts:
	app/views/pages/location.html.erb