Copied changes over from old local repository
Merge master into userregistration