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

[Andy Gunn]

@critzo - since @natmey is out for the next two weeks, can you take a look and merge when ready?


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