Merge branch 'master' into fixer1
adding grunt file
Merge branch 'fixer1'