Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/css/imports/_responsive.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/watcherTasks.xml
	Common/css/imports/_responsive.scss
	package.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/css/imports/_responsive.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/css/imports/_responsive.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/css/style.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	Common/css/imports/_responsive.scss
Merge remote-tracking branch 'origin/master'