update 11 may
Merge branch 'master' of github.com:kurai021/machinarium021_blog

Conflicts:
	config.js
	content/data/ghost-dev.db
	content/themes/ghostion/default.hbs
	content/themes/ghostion/partials/post_page/at_mainbody.hbs
	core/shared/lang/i18n.js
	node_modules/busboy/node_modules/readable-stream/lib/_stream_duplex.js
	node_modules/busboy/node_modules/readable-stream/lib/_stream_passthrough.js
	node_modules/busboy/node_modules/readable-stream/lib/_stream_readable.js
	node_modules/busboy/node_modules/readable-stream/lib/_stream_transform.js
	node_modules/busboy/node_modules/readable-stream/lib/_stream_writable.js
	node_modules/busboy/node_modules/readable-stream/node_modules/core-util-is/package.json
	node_modules/busboy/node_modules/readable-stream/package.json
	node_modules/downsize/package.json
	node_modules/express-hbs/node_modules/js-beautify/node_modules/mkdirp/package.json
	node_modules/express-hbs/node_modules/js-beautify/node_modules/nopt/node_modules/abbrev/package.json
	node_modules/express-hbs/node_modules/readdirp/node_modules/graceful-fs/graceful-fs.js
	node_modules/express-hbs/node_modules/readdirp/node_modules/graceful-fs/package.json
	node_modules/express-hbs/package.json
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/lib/_stream_duplex.js
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/lib/_stream_passthrough.js
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/lib/_stream_readable.js
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/lib/_stream_transform.js
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/lib/_stream_writable.js
	node_modules/express/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/package.json
	node_modules/express/node_modules/debug/Readme.md
	node_modules/express/node_modules/debug/lib/debug.js
	node_modules/express/node_modules/debug/package.json
	node_modules/express/node_modules/mkdirp/package.json
	node_modules/express/package.json
	node_modules/fs-extra/node_modules/mkdirp/package.json
	node_modules/fs-extra/node_modules/rimraf/package.json
	node_modules/grunt-contrib-compress/node_modules/archiver/node_modules/readable-stream/lib/_stream_duplex.js
	node_modules/grunt-contrib-compress/node_modules/archiver/node_modules/readable-stream/lib/_stream_passthrough.js
	node_modules/grunt-contrib-compress/node_modules/archiver/node_modules/readable-stream/lib/_stream_readable.js
	node_modules/grunt-contrib-compress/node_modules/archiver/node_modules/readable-stream/lib/_stream_transform.js
	node_modules/grunt-contrib-compress/node_modules/archiver/node_modules/readable-stream/lib/_stream_writable.js
	node_modules/grunt-contrib-compress/node_modules/archiver/node_modules/readable-stream/package.json
	node_modules/grunt-contrib-compress/node_modules/lazystream/node_modules/readable-stream/lib/_stream_duplex.js
	node_modules/grunt-contrib-compress/node_modules/lazystream/node_modules/readable-stream/lib/_stream_passthrough.js
	node_modules/grunt-contrib-compress/node_modules/lazystream/node_modules/readable-stream/lib/_stream_readable.js
	node_modules/grunt-contrib-compress/node_modules/lazystream/node_modules/readable-stream/lib/_stream_transform.js
	node_modules/grunt-contrib-compress/node_modules/lazystream/node_modules/readable-stream/lib/_stream_writable.js
	node_modules/grunt-contrib-compress/node_modules/lazystream/node_modules/readable-stream/package.json
	node_modules/grunt-contrib-handlebars/node_modules/chalk/node_modules/has-color/package.json
	node_modules/grunt-contrib-handlebars/node_modules/chalk/node_modules/has-color/readme.md
	node_modules/grunt-contrib-handlebars/node_modules/handlebars/package.json
	node_modules/grunt-contrib-sass/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/README.md
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/bin/uglifyjs
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/compress.js
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/scope.js
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/lib/sourcemap.js
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/async/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/test/compress/conditionals.js
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/tools/node.js
	node_modules/grunt-contrib-watch/node_modules/gaze/node_modules/globule/node_modules/glob/node_modules/inherits/package.json
	node_modules/grunt-contrib-watch/node_modules/gaze/node_modules/globule/node_modules/lodash/package.json
	node_modules/grunt-contrib-watch/node_modules/tiny-lr/node_modules/noptify/node_modules/nopt/node_modules/abbrev/package.json
	node_modules/grunt-express-server/README.md
	node_modules/grunt-express-server/package.json
	node_modules/grunt-express-server/tasks/express.js
	node_modules/grunt-express-server/tasks/lib/server.js
	node_modules/grunt-express-server/test/app.coffee
	node_modules/grunt-express-server/test/app.js
	node_modules/grunt-groc/node_modules/groc/node_modules/coffee-script/node_modules/mkdirp/package.json
	node_modules/grunt-groc/node_modules/groc/node_modules/glob/package.json
	node_modules/grunt-groc/node_modules/groc/node_modules/jade/node_modules/mkdirp/package.json
	node_modules/grunt-groc/node_modules/groc/node_modules/jade/node_modules/with/node_modules/uglify-js/package.json
	node_modules/grunt-groc/node_modules/groc/node_modules/uglify-js/README.md
	node_modules/grunt-groc/node_modules/groc/node_modules/uglify-js/bin/uglifyjs
	node_modules/grunt-groc/node_modules/groc/node_modules/uglify-js/lib/compress.js
	node_modules/grunt-groc/node_modules/groc/node_modules/uglify-js/lib/scope.js
	node_modules/grunt-groc/node_modules/groc/node_modules/uglify-js/lib/sourcemap.js
	node_modules/grunt-groc/node_modules/groc/node_modules/uglify-js/package.json
	node_modules/grunt-groc/node_modules/groc/node_modules/uglify-js/test/compress/conditionals.js
	node_modules/grunt-groc/node_modules/groc/node_modules/uglify-js/tools/node.js
	node_modules/grunt-jslint/History.md
	node_modules/grunt-jslint/Readme.md
	node_modules/grunt-jslint/index.js
	node_modules/grunt-jslint/lib/jslint.js
	node_modules/grunt-jslint/lib/reporters/check-style.js
	node_modules/grunt-jslint/lib/reporters/errors-only.js
	node_modules/grunt-jslint/lib/reporters/index.js
	node_modules/grunt-jslint/lib/reporters/jslint.js
	node_modules/grunt-jslint/lib/reporters/junit.js
	node_modules/grunt-jslint/lib/reporters/standard.js
	node_modules/grunt-jslint/lib/reporters/util.js
	node_modules/grunt-jslint/node_modules/jslint/README.md
	node_modules/grunt-jslint/node_modules/jslint/bin/jslint.js
	node_modules/grunt-jslint/node_modules/jslint/jslintrc.example
	node_modules/grunt-jslint/node_modules/jslint/lib/jslint-latest.js
	node_modules/grunt-jslint/node_modules/jslint/lib/linter.js
	node_modules/grunt-jslint/node_modules/jslint/lib/main.js
	node_modules/grunt-jslint/node_modules/jslint/node_modules/nopt/node_modules/abbrev/package.json
	node_modules/grunt-jslint/node_modules/jslint/package.json
	node_modules/grunt-jslint/package.json
	node_modules/grunt-jslint/tasks/jslint.js
	node_modules/grunt-shell/node_modules/chalk/node_modules/has-color/package.json
	node_modules/grunt-shell/node_modules/chalk/node_modules/has-color/readme.md
	node_modules/grunt/.npmignore
	node_modules/grunt/LICENSE-MIT
	node_modules/grunt/README.md
	node_modules/grunt/internal-tasks/bump.js
	node_modules/grunt/internal-tasks/subgrunt.js
	node_modules/grunt/lib/grunt.js
	node_modules/grunt/lib/grunt/cli.js
	node_modules/grunt/lib/grunt/config.js
	node_modules/grunt/lib/grunt/event.js
	node_modules/grunt/lib/grunt/fail.js
	node_modules/grunt/lib/grunt/file.js
	node_modules/grunt/lib/grunt/help.js
	node_modules/grunt/lib/grunt/log.js
	node_modules/grunt/lib/grunt/option.js
	node_modules/grunt/lib/grunt/task.js
	node_modules/grunt/lib/grunt/template.js
	node_modules/grunt/lib/util/task.js
	node_modules/grunt/node_modules/findup-sync/.jshintrc
	node_modules/grunt/node_modules/findup-sync/README.md
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/README.md
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/dist/lodash.compat.js
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/dist/lodash.compat.min.js
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/dist/lodash.js
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/dist/lodash.min.js
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/dist/lodash.underscore.js
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/dist/lodash.underscore.min.js
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/package.json
	node_modules/grunt/node_modules/findup-sync/package.json
	node_modules/grunt/node_modules/nopt/node_modules/abbrev/package.json
	node_modules/grunt/node_modules/rimraf/README.md
	node_modules/grunt/node_modules/rimraf/package.json
	node_modules/grunt/node_modules/rimraf/rimraf.js
	node_modules/grunt/package.json
	node_modules/knex/node_modules/mkdirp/package.json
	node_modules/knex/node_modules/optimist/package.json
	node_modules/knex/package.json
	node_modules/matchdep/node_modules/findup-sync/.jshintrc
	node_modules/matchdep/node_modules/findup-sync/README.md
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/README.md
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/glob.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/node_modules/inherits/README.md
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/node_modules/inherits/inherits.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/node_modules/inherits/package.json
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/package.json
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/test/bash-results.json
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/test/mark.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/glob/test/nocase-nomagic.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/lodash/README.md
	node_modules/matchdep/node_modules/findup-sync/node_modules/lodash/dist/lodash.compat.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/lodash/dist/lodash.compat.min.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/lodash/dist/lodash.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/lodash/dist/lodash.min.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/lodash/dist/lodash.underscore.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/lodash/dist/lodash.underscore.min.js
	node_modules/matchdep/node_modules/findup-sync/node_modules/lodash/package.json
	node_modules/matchdep/node_modules/findup-sync/package.json
	node_modules/matchdep/node_modules/globule/node_modules/lodash/package.json
	node_modules/matchdep/node_modules/stack-trace/package.json
	node_modules/mocha/node_modules/debug/Readme.md
	node_modules/mocha/node_modules/debug/lib/debug.js
	node_modules/mocha/node_modules/debug/package.json
	node_modules/mocha/node_modules/diff/package.json
	node_modules/mocha/node_modules/glob/node_modules/graceful-fs/graceful-fs.js
	node_modules/mocha/node_modules/glob/node_modules/graceful-fs/package.json
	node_modules/mocha/node_modules/jade/node_modules/mkdirp/package.json
	node_modules/mocha/node_modules/mkdirp/package.json
	node_modules/mysql/package.json
	node_modules/nodemailer/node_modules/mailcomposer/lib/mailcomposer.js
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mime/README.md
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mime/mime.js
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mime/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mime/test.js
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mime/types/mime.types
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mime/types/node.types
	node_modules/nodemailer/node_modules/mailcomposer/package.json
	node_modules/nodemailer/node_modules/readable-stream/lib/_stream_duplex.js
	node_modules/nodemailer/node_modules/readable-stream/lib/_stream_passthrough.js
	node_modules/nodemailer/node_modules/readable-stream/lib/_stream_readable.js
	node_modules/nodemailer/node_modules/readable-stream/lib/_stream_transform.js
	node_modules/nodemailer/node_modules/readable-stream/lib/_stream_writable.js
	node_modules/nodemailer/node_modules/readable-stream/package.json
	node_modules/nodemailer/node_modules/simplesmtp/.travis.yml
	node_modules/nodemailer/node_modules/simplesmtp/CHANGELOG.md
	node_modules/nodemailer/node_modules/simplesmtp/README.md
	node_modules/nodemailer/node_modules/simplesmtp/examples/simpleserver.js
	node_modules/nodemailer/node_modules/simplesmtp/examples/size.js
	node_modules/nodemailer/node_modules/simplesmtp/examples/validate-recipient.js
	node_modules/nodemailer/node_modules/simplesmtp/lib/client.js
	node_modules/nodemailer/node_modules/simplesmtp/lib/pool.js
	node_modules/nodemailer/node_modules/simplesmtp/lib/server.js
	node_modules/nodemailer/node_modules/simplesmtp/node_modules/rai/.travis.yml
	node_modules/nodemailer/node_modules/simplesmtp/node_modules/rai/lib/rai.js
	node_modules/nodemailer/node_modules/simplesmtp/node_modules/rai/package.json
	node_modules/nodemailer/node_modules/simplesmtp/package.json
	node_modules/nodemailer/node_modules/simplesmtp/test/client.js
	node_modules/nodemailer/node_modules/simplesmtp/test/pool.js
	node_modules/nodemailer/node_modules/simplesmtp/test/server.js
	node_modules/request/node_modules/form-data/node_modules/async/package.json
	node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
	node_modules/request/node_modules/http-signature/package.json
	node_modules/rss/node_modules/mime/package.json
	node_modules/rss/node_modules/xml/package.json
	node_modules/rss/package.json
	node_modules/showdown/package.json
	node_modules/sqlite3/node_modules/mkdirp/package.json
	node_modules/sqlite3/node_modules/tar.gz/node_modules/fstream/node_modules/graceful-fs/graceful-fs.js
	node_modules/sqlite3/node_modules/tar.gz/node_modules/fstream/node_modules/graceful-fs/package.json
	node_modules/sqlite3/node_modules/tar.gz/node_modules/tar/node_modules/inherits/package.json
	node_modules/sqlite3/node_modules/tar.gz/package.json
	node_modules/sqlite3/package.json
	node_modules/supertest/node_modules/superagent/node_modules/debug/package.json
	node_modules/underscore/package.json
	node_modules/unidecode/package.json