grunt files generated
Merge from master and setup for 1.0.0 release.
fix commit
Merge branch 'production'
JS files generated