Merge remote-tracking branch 'origin' into release
Updated pm-existing pages not to highjack /user
Merge branch 'release' into development