Use yeoman-generator 0.18
Merge branch 'develop' of github.com:jalet/generator-spl-jquery into develop

Conflicts:
	test/test-files.js