fix
Merge branch 'develop'

Conflicts:
	.gitignore
Update Gruntfile.js

Got error "Running "concat:app" (concat) task
Warning: Unable to write "undefined" file (Error code: undefined). Use --force to continue." with the empty app target for concat.
Merge pull request #1 from gabrielf/patch-1

Update Gruntfile.js
before merge into master
Merge branch 'develop'