removed phpdcd and new badges
fix conflicts
update readme license
Merge branch 'develop'
Merge branch 'master' of github.com:juliangut/zdt-additions