fix #985: maks sFactory private - force injection in test module
remove UI tests (Robotium)
fix WPHtmlTest (startImg was static)
fix PostUploadService tests for Zbeta variant
Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private

Conflicts:
	WordPress/src/androidTest/java/org/wordpress/android/ActivityRobotiumTestCase.java
set 72dp left content inset
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop
Changed drawer shadow 9 patch to be 1px tall.

Fixes #2107
Set the drawer width on the scrim frame layout.
Merge pull request #2109 from wordpress-mobile/issue/2107-nav-drawer-fixes

Issue/2107 nav drawer fixes
remove JSONUtil.copyJSONObject test
Merge branch 'develop' into issue/985-make-sfactory-private
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop
Merge branch 'release/3.5' of github.com:wordpress-mobile/WordPress-Android into develop
remove org.apache.httpcomponents dependency (use internal Android version)
move database deletion, and delegate creation to the WordPressDB constructor
update readme to run tests
change reader card and spinner spacing to match the action bar title left margin
Merge pull request #2106 from wordpress-mobile/issue/2102-toolbar-padding

Fix #2102: set 72dp left content inset
Merge pull request #2006 from wordpress-mobile/issue/985-make-sfactory-private

fix #985 make sFactory private in factories