[Commotion-admin] [commotion-docs] Merge Staging into Master (#308)

[Andy Gunn]

@natmey - Please review and merge when ready!

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