TABDEV-2740 User can still upload image when images are disabled
TABDEV-2740 Updated OCMock Library to ensure Xcode5 compatibility
TABDEV-2740 Added unit tests
Merge branch 'TABDEV-2740' into develop