лк+ правки
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/easy-responsive-tabs.css