Untrack due to file being project specific
Ignore .settings directory
Will not track project.properties
Merge branch 'develop' of https://github.com/aqm1970/Android-Tools.git into develop