Commit
Merge branch 'master' into iframes

Conflicts:
	src/generators/ThankYouGenerator.java
2213
Merge branch 'iframes'