[Commotion-admin] [commotion-docs] Merge Staging into Master (#308)

[Nat Meysenburg]

Looks good on the staging site. Will close and regenerate the live one!

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/commotion-docs/pull/308#issuecomment-64418668
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20141125/205f8263/attachment-0001.html>