[Commotion-admin] [commotion-docs] merging recent changes from staging to master (#184)

[critzo]

Merged #184.

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