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

Conflicts:
	AndroidManifest.xml
Merge branch 'dev' of https://github.com/SocialHeat/SocialHeat-Android-app into dev
Moved filtering to side menu