Some small changes
Smaller structural changes
Fixed some Dropbox things
Resolving problems and conflicts
Rearaganged files
small changes
Fixed conflicts in AndroidManifest.xml
Fix merge Alex
Updated start screen etc
Updated adapter and start screen