Changing /signup/registration to make room for Ngo registration
Merge remote-tracking branch 'upstream/master'