updating Gruntfile for cca
Merge branch 'dev' into ryscheng-cordova

Conflicts:
	Gruntfile.coffee
Merge pull request #112 from uProxy/ryscheng-cordova

updating Gruntfile for cca