Add smart logging with marker (fix #33)
Add i18ned message
Fix build and clean up
:(
...so tired today
Merge remote-tracking branch 'upstream/master'

Conflicts:
	org.jrebirth/core/pom.xml