Merge branch 'hotfix/1.0.3'
Merge branch 'hotfix/1.0.4'
Merge tag '1.0.4' into develop

Fixed keyword in package.json so gulp-loader shows up in gulp plugin search

Conflicts:
	README.md