Merge branch 'murielm' of /Users/dbudor/AndroidStudioProjects/zipato-android-v2 with conflicts.
mass reformat