Merge 'gauntface-master' into master
Add additional grunt cordova tasks