Технический коммит(пустой)
Merge branch 'master' of github.com:Aitid/veles

Conflicts:
	themes/veles/web/css/style.css
Merge branch 'master' of github.com:Aitid/veles
Merge branch 'master' of github.com:Aitid/veles
Merge branch 'master' of github.com:Aitid/veles

Conflicts:
	themes/veles/web/css/style.css
Изменения на сервере
Merge branch 'master' of github.com:Aitid/veles
Merge branch 'master' of github.com:Aitid/veles
Merge branch 'master' of github.com:Aitid/veles
Merge branch 'master' of github.com:Aitid/veles