updated the automatic generation of bower.json by grunt
fixes to Gruntfile
Merge branch 'develop'