+
Merge branch 'master' into newCaseSpinnerTest
+
Merge branch 'newCaseSpinnerTest'

Conflicts:

VitaSolutionSource/VitaSolution/VitaSolution/res/layout/new_case_screen.
xml