added header options for google iframes (feedback)
Merge branch 'master' of git@github.com:FlorianTopf/impex-portal.git

Conflicts:
	app/controllers/Actions.scala