Merge pull request #114 from edx/dev

Dev
Merge pull request #115 from edx/dev

Dev
Merge pull request #116 from edx/dev

Dev
Merge pull request #117 from edx/dev

Fix permissions issues that prevent schema from being viewed
Merge remote-tracking branch 'origin/master' into dev