Added files and fixed some bugs
Merge remote-tracking branch 'origin/Tom'
Fixed file related bugs, uploading new files

17x28
Changed overall look of the UI & exc. handler
No animation when switching activities