Adding sync down after sync up in sample app
Merge pull request #724 from bhariharan/unstable

Adding sync down after sync up in sample app
Remove SyncBasicHttpParams from httpcore
Fixing test
Merge pull request #725 from bhariharan/unstable

Remove SyncBasicHttpParams from httpcore
Reverting test fix
More path fixes, making ANDROID_HOME prereq
Specifically targeting 'android' tool from the Android SDK
Adding Windows android path, reverting plugin path
Don't need volatile_unstable plugin.

Android doesn't use binaries in the plugin.  The main unstable branch will suffice.
Merge pull request #726 from khawkins/fix_windows

Adding agnostic paths to npm package, checking for Android SDK
First round of CacheManager refactoring
Simplify and optimize CacheManager implementation
Making paths platform agnostic, requiring Android SDK settings
Merge pull request #727 from bhariharan/unstable

Simplify and optimize CacheManager implementation
Merge pull request #728 from khawkins/master_windows_fix

Making paths platform agnostic, requiring Android SDK settings
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	node/forcedroid.js
	package.json
Merge pull request #729 from khawkins/unstable

Merging master to unstable
Merge branch 'unstable' into cordova_gradle