Merge branch 'hotfix/phpmd_fixes'
Added to travis.yml
Merge branch 'master' of git://github.com/Sourceror/zf2-challenge-module into develop