Making paths platform agnostic, requiring Android SDK settings
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