fixing bug & Ui changes
Merge branch 'master' of https://github.com/AndroidTresLeches/AADP_AndroidClient into event_feature
Merge pull request #74 from AndroidTresLeches/event_feature

Event feature