resolved merge conflicts
Merge pull request #18 from rwarbelow/guardian_profile_registration

resolved merge conflicts