Edit supplier + some other stuff
Merge branch 'master' of https://github.com/lukeeee/Royal-Hearts

Conflicts:
	public/administrator.php