Adding some module dependencies
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/config/routesSpec.js
Refactoring the server creation to make it more modular