more cleanup
added test fix commit from nicolas, missed to fetch org
Merge pull request #89 from exside/master

More cleanup + reintegrated test fix from nicolas after missed fetch
Final cleanup and fixes + APK File
forgot project file
revert layout change
Merge pull request #90 from exside/master

Final fixes and APK file