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

[Nat Meysenburg]

Closed #308.

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