Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	user/login.php
Merge branch 'master' of https://github.com/Sunday-Without-God/Juice