First push
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/assets/css/style.css
	frontend/assets/scss/style.scss
	sites/all/themes/theme/assets/css/style.css
	sites/all/themes/theme/assets/scss/style.scss