big repo updates, master2 etc
chdir to origDir before re-running mca-create upon repo update
fixed everything, fingers crossed
new version
Merge branch 'master' into HEAD

Conflicts:
	cordova-cli