Merge branch 'release/1.0.4' into develop
Added lint for css and cleanup for jshint
Bumped version number
Merge branch 'release/1.0.5'