Major version now feature complete with Bieber.
Merge branch 'master' into marcoVermeulen-master

Conflicts:
	src/main/resources/messages.properties
	src/test/groovy/app/FunctionalSpec.groovy