Small tweaks to login/forgot password templates
Make permission set parsing more forgiving (to ease server upgrades). Add test.
Merge branch 'master' into signup_flow
Add some in-progress docs on permission sets
Merge documentation update from master.