Initial thoughts on the fix.
David's help with the history issue
Final clean-up
Merge branch 'feature-je-history'
Merge branch 'origin/develop'

Conflicts:
	Rock/Web/UI/RockPage.cs
RockPage Changes