Merge pull request #73 from AndroidTresLeches/event_feature

UI changes
fixing bug & Ui changes
Merge branch 'master' of https://github.com/AndroidTresLeches/AADP_AndroidClient into event_feature