Changed site name
Fixx0red conflict
Merge branch 'develop' of github.com:foonly/Heraldry into develop

Conflicts:
	globals/settings.inc