logging
logging
Merge branch 'master' of https://github.com/glenlivet/malte

Conflicts:
	rontai-p-template/src/main/java/org/rontai/p/template/App.java