Contribution merge. Remove unused files. Replaced novocation 1.0.8 with 2.0 Alpha because it is not compatible with Api Level 17.