Fixed .iml file.  Vinnie-you may need to adjust yours
Some cleanup
Passsing Case to CaseFragment
Fixed merge conflicts.  Added injecction for CaseFragment
Fixed conflicts in -Android.iml