removed phpdcd and new badges
fix conflicts