MOBILE-1794
MOBILE-1759
MOBILE-1792
MOBILE-1797
MOBILE-1799
MOBILE-1798	
MOBILE-1792
MOBILE-1793
Merge pull request #118 from jmpascal/master

[QA Fix]