npm lib update
change app back to no-requirejs mode
npm libs updated
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 8 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	node_modules/.bin/jade
#	node_modules/express/client.js
#	node_modules/express/node_modules/commander/.npmignore
#	node_modules/express/node_modules/commander/.travis.yml
#	node_modules/express/node_modules/commander/Makefile
#	node_modules/express/node_modules/commander/lib/
#	node_modules/express/node_modules/connect/node_modules/formidable/
#	node_modules/express/node_modules/connect/node_modules/qs/.travis.yml
#	node_modules/express/node_modules/connect/node_modules/qs/History.md
#	node_modules/express/node_modules/connect/node_modules/qs/Makefile
#	node_modules/express/node_modules/connect/node_modules/qs/benchmark.js
#	node_modules/express/node_modules/connect/node_modules/qs/component.json
#	node_modules/express/node_modules/connect/node_modules/qs/examples.js
#	node_modules/express/node_modules/connect/node_modules/qs/lib/
#	node_modules/express/node_modules/connect/node_modules/qs/querystring.js
#	node_modules/express/node_modules/connect/node_modules/qs/test/
#	node_modules/express/node_modules/connect/test.js
#	node_modules/express/node_modules/mkdirp/.gitignore.orig
#	node_modules/express/node_modules/mkdirp/.gitignore.rej
#	node_modules/express/node_modules/mkdirp/examples/pow.js.orig
#	node_modules/express/node_modules/mkdirp/examples/pow.js.rej
#	node_modules/express/test.js
#	node_modules/jade/
npm libs updated
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 8 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	node_modules/.bin/jade
#	node_modules/express/client.js
#	node_modules/express/node_modules/commander/.npmignore
#	node_modules/express/node_modules/commander/.travis.yml
#	node_modules/express/node_modules/commander/Makefile
#	node_modules/express/node_modules/commander/lib/
#	node_modules/express/node_modules/connect/node_modules/formidable/
#	node_modules/express/node_modules/connect/node_modules/qs/.travis.yml
#	node_modules/express/node_modules/connect/node_modules/qs/History.md
#	node_modules/express/node_modules/connect/node_modules/qs/Makefile
#	node_modules/express/node_modules/connect/node_modules/qs/benchmark.js
#	node_modules/express/node_modules/connect/node_modules/qs/component.json
#	node_modules/express/node_modules/connect/node_modules/qs/examples.js
#	node_modules/express/node_modules/connect/node_modules/qs/lib/
#	node_modules/express/node_modules/connect/node_modules/qs/querystring.js
#	node_modules/express/node_modules/connect/node_modules/qs/test/
#	node_modules/express/node_modules/connect/test.js
#	node_modules/express/node_modules/mkdirp/.gitignore.orig
#	node_modules/express/node_modules/mkdirp/.gitignore.rej
#	node_modules/express/node_modules/mkdirp/examples/pow.js.orig
#	node_modules/express/node_modules/mkdirp/examples/pow.js.rej
#	node_modules/express/test.js
#	node_modules/jade/
npm libs updated
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 8 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	node_modules/.bin/jade
#	node_modules/express/client.js
#	node_modules/express/node_modules/commander/.npmignore
#	node_modules/express/node_modules/commander/.travis.yml
#	node_modules/express/node_modules/commander/Makefile
#	node_modules/express/node_modules/commander/lib/
#	node_modules/express/node_modules/connect/node_modules/formidable/
#	node_modules/express/node_modules/connect/node_modules/qs/.travis.yml
#	node_modules/express/node_modules/connect/node_modules/qs/History.md
#	node_modules/express/node_modules/connect/node_modules/qs/Makefile
#	node_modules/express/node_modules/connect/node_modules/qs/benchmark.js
#	node_modules/express/node_modules/connect/node_modules/qs/component.json
#	node_modules/express/node_modules/connect/node_modules/qs/examples.js
#	node_modules/express/node_modules/connect/node_modules/qs/lib/
#	node_modules/express/node_modules/connect/node_modules/qs/querystring.js
#	node_modules/express/node_modules/connect/node_modules/qs/test/
#	node_modules/express/node_modules/connect/test.js
#	node_modules/express/node_modules/mkdirp/.gitignore.orig
#	node_modules/express/node_modules/mkdirp/.gitignore.rej
#	node_modules/express/node_modules/mkdirp/examples/pow.js.orig
#	node_modules/express/node_modules/mkdirp/examples/pow.js.rej
#	node_modules/express/test.js
#	node_modules/jade/
Merge branch 'dev'

Conflicts:
	client/admin/controllers/admin-login.js
	client/app/app.js
	client/app/js/controllers/blog-details.js
	client/app/js/controllers/blog-list.js
	client/app/js/controllers/site-login.js
	client/app/js/directives/markdown-editor.js
	client/app/partials/admin/taskList.html
	client/index.html
	node_modules/connect/node_modules/batch/.npmignore
	node_modules/express/.travis.yml
	node_modules/express/History.md
	node_modules/express/Readme.md
	node_modules/express/bin/express
	node_modules/express/lib/response.js
	node_modules/express/lib/utils.js
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/commander/.npmignore
	node_modules/express/node_modules/commander/History.md
	node_modules/express/node_modules/commander/Readme.md
	node_modules/express/node_modules/commander/index.js
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/lib/middleware/basicAuth.js
	node_modules/express/node_modules/connect/lib/middleware/compress.js
	node_modules/express/node_modules/connect/lib/middleware/directory.js
	node_modules/express/node_modules/connect/lib/middleware/json.js
	node_modules/express/node_modules/connect/lib/middleware/multipart.js
	node_modules/express/node_modules/connect/lib/middleware/session.js
	node_modules/express/node_modules/connect/lib/middleware/static.js
	node_modules/express/node_modules/connect/lib/middleware/urlencoded.js
	node_modules/express/node_modules/connect/lib/proto.js
	node_modules/express/node_modules/connect/node_modules/bytes/History.md
	node_modules/express/node_modules/connect/node_modules/bytes/package.json
	node_modules/express/node_modules/connect/node_modules/qs/index.js
	node_modules/express/node_modules/connect/node_modules/qs/package.json
	node_modules/express/node_modules/connect/package.json
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/cookie/package.json
	node_modules/express/node_modules/debug/.npmignore
	node_modules/express/node_modules/debug/package.json
	node_modules/express/node_modules/fresh/package.json
	node_modules/express/node_modules/methods/package.json
	node_modules/express/node_modules/mkdirp/package.json
	node_modules/express/node_modules/send/node_modules/mime/package.json
	node_modules/express/node_modules/send/package.json
	node_modules/express/package.json
	node_modules/jade/README.md
	node_modules/jade/component.json
	node_modules/jade/jade-language.md
	node_modules/jade/jade.js
	node_modules/jade/lib/compiler.js
	node_modules/jade/lib/jade.js
	node_modules/jade/lib/lexer.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/async/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/constantinople/package.json
	node_modules/jade/node_modules/mkdirp/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/node_modules/lru-cache/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/node_modules/sigmund/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/package.json
	node_modules/jade/node_modules/transformers/node_modules/css/package.json
	node_modules/jade/node_modules/transformers/node_modules/promise/node_modules/is-promise/package.json
	node_modules/jade/node_modules/transformers/node_modules/promise/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/async/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json
	node_modules/jade/node_modules/with/package.json
	node_modules/jade/package.json
	server/infrastructure/security.js
	webserver.js