Merging latest content with Master

Fixed a conflict in gh-pages and finished merging accessor branch. Merging into master.