Merge pull request #78 from jmpascal/master

Sprint 3 : Bug fixing + Reduce code violations
Bug fixing

Fixed MOBILE-1420, fixed MOBILE-1411
Merge pull request #79 from ldjagger/master

Bug fixes and resolved crash situation on phone sized resources
Merge remote-tracking branch 'parent/master'