Merge to master before reintegrating js

Content is prepped minus some details and videos. Pushing to master before xapiwrapper.js is reintegrated.