update for 1.10.0-rc1
Merge branch 'master' of https://github.com/Elgg/old-elgg-website