Updates 8/30/2014
Merge branch 'master' of https://github.com/Adaax/mesh-workshop