Filled in EventFilter
Merge branch 'dev' of https://github.com/SocialHeat/SocialHeat-Android-app into dev