after coding dojo 15/10/2014
Merge branch 'master' of https://github.com/soltiz/DT-dojo