login stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/index.php
Merge remote-tracking branch 'origin/master'