assets

Conflicts:
	assets/vendor/socket.io-client/dist/socket.io.js
	assets/vendor/socket.io-client/dist/socket.io.min.js
	assets/vendor/socket.io-client/package.json
Green

Conflicts:
	npm-shrinkwrap.json
	test/common.js
	test/test-REST-requests.js
	test/test-edge-cases.js
Don't try to eagerly validate mongoose validators

Conflicts:
	example/classic/models/tests.js
	lib/controllers.js
publish via travis
some overhead after cherypick.
Two new examples
green + remove `serve_static`
working on opinion
3.2.0