build for android done, and some other changes
Merge branch 'develop' of https://github.com/Dincu/Geometry into develop