Working on grunt build
Updated grunt build