[Commotion-admin] [commotion-docs] Merges recent changes into master branch (#172)

[critzo]

Merged #172.

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