Fixat Profile Fragment /Martin
Merge branch 'master' of https://github.com/Hyperactivity/android-app
Merge branch 'master' of https://github.com/Hyperactivity/android-app