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

[critzo]

Merged #179.

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