c-test added
Merge branch 'master' of https://github.com/glenlivet/malte

Conflicts:
	rontai-p-template/pom.xml