Merge pull request #87 from theodortruffer/master

cleanup done
Merge cleanup and make app work in emulator
revert f ed up merge
Merge branch 'master' of https://github.com/exside/ese2013-team5
cleanup merge mess
Include cleanup merge and make app work in emulator for screenshots
Merge pull request #88 from exside/master

Include cleanup merge and make app work in emulator for screenshots
fixed some tests not working correctly
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