Added objects needed for compo system
Implemented error message to user if username or email is already in use by another user
Fixed typo
Fixed bug created by @petterroea
Merge remote-tracking branch 'origin/master' into experimental