Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	core/src/main/java/templateconfig.properties
Merge branch 'develop' of https://github.com/contento3/Projects into develop