Modifications to user.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	user.php
Merge branch 'master' of https://github.com/not-inept/rpi-s