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

Conflicts:
	public_html/render.php
small tweaks