refactor(app:templates:server): deprecate res.sendfile -- use res.sendFile instead
Merge pull request #539 from cesarvargas00/master

refactor(app:templates:server): deprecate sendfile -- use sendFile instead
feat(gen): Remove global jQuery dependency

Close #547
Minor typo fix in using generator instructions
Merge pull request #550 from virtualandy/patch-1

Minor typo fix in using generator instructions
use grunt injector instead of fork
Merge remote-tracking branch 'origin/master'
Merge pull request #548 from pasine/nojquery

feat(gen): Remove global jQuery dependency
Merge branch 'master' into canary

Conflicts:
	app/templates/Gruntfile.js
	app/templates/_bower.json
	test/fixtures/package.json