Merge branch 'cal-selection' of https://github.com/SocialHeat/SocialHeat-Android-app into dev
Merge branch 'cal-selection' of https://github.com/SocialHeat/SocialHeat-Android-app into dev
Merge branch 'cal-selection' of https://github.com/SocialHeat/SocialHeat-Android-app into dev
Merge branch 'dev' of https://github.com/SocialHeat/SocialHeat-Android-app into dev
Changed "Up" handling