Fixes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	admin.php
Fixes
Merge pull request #3 from christran/develop

Develop