updated grunt.js to remove uglify from build script
Merge branch 'develop'
clean up
Merge branch 'master' into develop