Merge branch 'release/0.7'
Merge branch 'release/dojo-20140517'
Merge branch 'develop' of https://github.com/toto-castaldi/coder-dojo-mod into develop
custom sword