Merge pull request #63 from ldjagger/master

MOBILE-1296
Merge pull request #64 from jmpascal/master

[REVIEW]MOBILE-1149/1144
Merge pull request #65 from jmpascal/master

MOBILE-1309