Cleanup
Merge branch 'develop' of github.com:foonly/Heraldry into develop

Conflicts:
	include/init.php