Merge pull request #160 from chrox/master

fix gettext build
refactoring Makefile and make Android target