Several updates
Merge branch 'master' of https://github.com/simeonoff/SP-OneAccess-Portal