[Commotion-admin] [commotion-docs] Update master from staging - multiple changes (#227)

[critzo]

Merged #227.

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