Merge https://github.com/EfestiArtMakers/manager

Conflicts:
	node_modules/express/bin/express
	node_modules/express/node_modules/connect/node_modules/multiparty/index.js
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/test/simple/test-stream2-pipe-error-once-listener.js
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/file/blank.gif
	node_modules/stylus/bin/stylus