Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	css/style.css.map
	css/style.scss
	js/default.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	css/style.css.map
	css/style.scss
	js/default.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css