Remove duplicated classes
Merge branch 'develop' of https://github.com/tcoupin/circedroid into develop