Update dependencies to include @netanelgilad  Cordova fix of angular-meteor
Merge remote-tracking branch 'origin/master'

Conflicts:
	versions.json