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
chore(gen): Add gitter.im badge
Merge pull request #611 from JaKXz/chore/add-gitter

chore(gen): Add gitter.im badge
add production e2e tests back in, only test against node 0.10.x

closes #604
test(gen): fix grunt test false positives

#closes 606
test(gen): add grunt test:fast task to generator, for skipping e2e tests
comment out e2e production tests again because of flaky results
missed one test that should have been commented out
Merge branch 'master' into canary

Conflicts:
	app/templates/Gruntfile.js
	app/templates/_bower.json
	test/fixtures/package.json
fix sendFile on routes
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into canary

Conflicts:
	app/templates/server/config/express.js
fix appPath for serving index.html