Some Android Fixes
Merge branch 'developing' of https://github.com/expyriment/expyriment into developing