Cleanup and minor improvements ...

removed unused resources, changed target sdk version to be ready for
adding the HTC One (M7) to the compatible device list.
Fixed some lint error's .
Merge remote-tracking branch 'origin/WIP'