we

we
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/web/about.html
	app/web/images/10.png
	app/web/images/8_2.png
	app/web/images/information3.png
	app/web/index.html
	app/web/merchant.html
	parse/cloud/app.js
	parse/cloud/image.js
	parse/cloud/user.js
	parse/cloud/views/home.ejs
	parse/cloud/views/image/show.ejs
	parse/cloud/views/layout.ejs
	parse/cloud/views/login.ejs
	parse/cloud/views/merchant.ejs
	parse/config/global.json
	parse/public/css/normalize.css
	parse/public/css/the-jr-central-market.webflow.css
	parse/public/css/webflow.css
	parse/public/images/1.png
	parse/public/js/modernizr.js
	parse/public/js/webflow.js