Обновить контент страницы o_proekte
Merge branch 'omarr' into develop

Conflicts:
	assets/=kit=pages/o_proekte.kit
	assets/common.js
	less/style.less
	www/css/style.css
	www/css/style.css.map
	www/js/common.min.js
	www/o_proekte.html