Fixed config bug
Ran grunt task
Fixed minify bug
Ran grunt for lastest distribution files
Fixed merge