last edit
Merge branch 'smokescreen' of https://github.com/BlackBox3750/System into smokescreen

Conflicts:
	UI/main_login.html
	UI/main_login.php
Fixed merge error