MOBILE-1437
[Code violations] Reduction
Merge pull request #79 from ldjagger/master

Bug fixes and resolved crash situation on phone sized resources
Merge remote-tracking branch 'parent/master'
MOBILE-1438
[Quick Fix] Correct update process in phone case.
Merge pull request #80 from jmpascal/master

Bug fix and code violations.
Potential fix for MOBILE-1445