Merge pull request #3 from PrototypeAlex/master

Grunt build - Concat and Uglify