Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	css/style.css.map
	css/style.scss
	js/default.js
Merge branch 'master' of https://github.com/mustafazaki/mall_of_the_world_website
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	css/style.css.map
	css/style.scss
	js/default.js