Step 8 added
Merge branch 'master' of https://github.com/thehme/showtracker

Conflicts:
	node_modules/bcryptjs/package.json
	node_modules/mongoose/node_modules/hooks/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/Makefile
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/Release/.deps/Release/obj.target/bson/ext/bson.o.d
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/Release/bson.node
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/Release/obj.target/bson/ext/bson.o
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/bson.target.mk
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/build/config.gypi
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Makefile
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/.deps/Release/obj.target/kerberos/lib/base64.o.d
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/.deps/Release/obj.target/kerberos/lib/kerberos.o.d
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/.deps/Release/obj.target/kerberos/lib/kerberos_context.o.d
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/.deps/Release/obj.target/kerberos/lib/kerberosgss.o.d
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/.deps/Release/obj.target/kerberos/lib/worker.o.d
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/kerberos.node
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/obj.target/kerberos/lib/base64.o
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/obj.target/kerberos/lib/kerberos.o
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/obj.target/kerberos/lib/kerberos_context.o
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/obj.target/kerberos/lib/kerberosgss.o
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/Release/obj.target/kerberos/lib/worker.o
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/config.gypi
	node_modules/mongoose/node_modules/mongodb/node_modules/kerberos/build/kerberos.target.mk
	node_modules/mongoose/node_modules/mongodb/node_modules/readable-stream/node_modules/core-util-is/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/readable-stream/node_modules/inherits/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/readable-stream/node_modules/string_decoder/package.json
	node_modules/mongoose/node_modules/mpath/package.json
	node_modules/mongoose/node_modules/ms/package.json
	node_modules/mongoose/node_modules/sliced/package.json
	node_modules/mongoose/package.json