Merge remote-tracking branch 'origin/master' into be_a_donor
Merge pull request #91 from AndroidTresLeches/event_feature

Event feature
updated step 3
Merge pull request #92 from AndroidTresLeches/be_a_donor

Be a donor
minor bug fixes