commit
commit
Merge branch 'master' of https://github.com/luitgy/Deliverum-Core.git

Conflicts:
	bin/deliverum-core.jar