Merge branch 'master' of C:\Users\Triplus3\AndroidStudioProjects\git\452010\zipato-android-v2 with conflicts.
fuckin case insensitivity
fuckin case insensitivity