fixed gruntfile
Merge branch 'develop' into staging
favicon