More stuff...
Fixing more random stuff
Merge branch 'initialInterface' of https://github.com/ppod1991/helpp-android.git into initialInterface
Eclipse broke again...