upgraded to 0.3.0-SNAPSHOT for further development
Merge branch 'hotfix/0.2.1' into develop

Conflicts:
	pom.xml
added JsonInclude NON_NULL to template_content
added validation stuff to mandatory fields
updated version to 0.3.0 for release
Merge branch 'release/0.3.0'