Simple renaming
Removed unused file
Merge branch 'master' of github.com:estien/ReisekompisAndroid