update
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/css/main.css
	assets/css/main.min.css
	assets/fonts/svg/uE001-arrow.svg
	assets/fonts/svg/uE001-arrow270.svg
	assets/fonts/svg/uE002-arrow-left.svg
	assets/fonts/svg/uE002-arrow395.svg
	assets/fonts/svg/uE003-arrow-up.svg
	assets/fonts/svg/uE003-arrow408.svg
	assets/fonts/svg/uE004-arrow-down.svg
	assets/fonts/svg/uE004-arrow413.svg
	assets/fonts/svg/uE00A-expand.svg
	assets/fonts/svg/uE00A-expand22.svg
	assets/fonts/svg/uE00B-next.svg
	assets/fonts/svg/uE00B-next15.svg
	assets/fonts/svg/uE00C-previous.svg
	assets/fonts/svg/uE00C-previous11.svg
	assets/fonts/svg/uE00D-right.svg
	assets/fonts/svg/uE00D-right106.svg
	frontend/svg/uE001-arrow270.svg
	frontend/svg/uE002-arrow395.svg
	frontend/svg/uE003-arrow408.svg
	frontend/svg/uE004-arrow413.svg
	frontend/svg/uE00A-expand22.svg
	frontend/svg/uE00B-next15.svg
	frontend/svg/uE00C-previous11.svg
	frontend/svg/uE00D-right106.svg