platform.js
add firefoxos to gruntfile
override init.js in the firefoxos platform for navigator fix, other bugfixes
implement exec for firefoxos
platform.js
add firefoxos to gruntfile
override init.js in the firefoxos platform for navigator fix, other bugfixes
fixed merge issues
[CB-4149] Read version from VERSION when there is no .git/
Merge branch 'master' into ffos
updated ffos to use win8 style commandProxy
removed unnessary console.log
[CB-4761] Add cordova.platformId property
Set VERSION to 3.2.0-dev (via coho)
Fix packager to not add commit hash when creating a tagged version

Was adding -0-HASH to version when we just want the tag.
Change build stamp again by having it use only VERSION file on master branch

This will have it show "3.2.0-dev-HASH" on master even though there is
no "3.2.0-dev" git tag.
Add RELEASENOTES.md for 3.1.0
Merge branch 'master' into fxos and removed some of the crap I've added

Conflicts:
	lib/firefoxos/exec.js
	lib/firefoxos/init.js
	lib/firefoxos/platform.js