Upping develop branch versions ready for 1.4.0
Merge branch 'Upstream_release' into Upstream_develop
Merge branch 'Upstream_release' into Upstream_develop
Merge remote-tracking branch 'Upstream/release' into Upstream_develop
Merge remote-tracking branch 'Upstream/release' into Upstream_develop
Merge branch 'Upstream_release' into Upstream_develop
Merge branch 'Upstream_release' into Upstream_develop
Merge branch 'Upstream_release' into Upstream_develop
Merge branch 'Upstream_release' into Upstream_develop
Merge branch 'Upstream_release' into Upstream_develop
Merge branch 'Upstream_release' into Upstream_develop
Merge remote-tracking branch 'Upstream/release' into Upstream_develop
Merge remote-tracking branch 'Upstream/release' into Upstream_develop
Merge branch 'Upstream_release' into Upstream_develop

Conflicts:
	android/clientbeta/AndroidManifest.xml
Merge branch 'Upstream_master' into Upstream_release
Merge branch 'Upstream_release' into Upstream_develop
Remove In App Purchases listing on Play Store
Merge remote-tracking branch 'Upstream/pull/378' into Upstream_master