update body-parser
update to jasmine 2 (new syntax)

Conflicts:
	package.json
update watchify