Merged swagger-security branch

Conflicts:
	middleware/index.js
	package.json
	test/test-module.js