Latest with all the classes
Merge branch 'master' of https://github.com/weidixon/Relicious

Conflicts:
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class
	target/classes/DataSource.class
	target/classes/UrlMappings.class
	target/classes/resources.class