Bug fixing
Bug fixes
Merge branch 'master' of https://github.com/brunopp/4semesterAndroid