PHP QA
Fixed some phpmd and code sniff errors
Merge branch 'develop'