Added user accounts and other stuff.
Merge branch 'develop' of github.com:foonly/Heraldry into develop

Conflicts:
	templates/admin/admin_menu.php
	templates/admin/index.tpl