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

[critzo]

tested and merged. looks good to me!

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