Merge remote-tracking branch 'upstream/develop' into develop
[gh-465] Missed a callback rename for mysites block.
[gh-529] Add mysites page with hook_menu so it can be access controlled
Merge pull request #534 from tsteiner2/issue-465

Closes #465 again (Missed a callback rename for mysites block)
Merge pull request #535 from erasmussen2/issue-529

Closes #529