* fixed android compilation
* fixed typos
Merge pull request #36 from SmartCat/gaf_4_develop

Fixed Android compilation