Add jasmine as optional test-framework
Merge branch 'feature/jasmine' of https://github.com/kojiwakayama/generator-node-gulp into kojiwakayama-feature/jasmine

* 'feature/jasmine' of https://github.com/kojiwakayama/generator-node-gulp:
  Add jasmine as optional test-framework

Conflicts:
	app/templates/_gulpfile.js
	app/templates/test/name_test.js
Merge branch 'kojiwakayama-feature/jasmine'

* kojiwakayama-feature/jasmine:
  Add jasmine as optional test-framework