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