commit
Merge branch 'master' of github.com:xinranxiao/Landmark

Conflicts:
	README.md
	config/connections.js
	config/csrf.js
	config/env/development.js
	config/http.js
	config/i18n.js
	config/models.js
	config/policies.js
	config/session.js
	config/views.js
	package.json
	views/500.swig