Lots of different things to add individual user registration with the server
Merge remote-tracking branch 'origin/master'