tempplate1
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_ciklum_v1/css/style.css
	test_ciklum_v1/css/style.less
	test_ciklum_v1/index.html
	test_ciklum_v1/js/scale.js
tempplate1