Обновил
Merge branch 'master' of https://github.com/range-web/gkh2

Conflicts:
	public_html/protected/extensions/bootstrap/assets/js/ace.min.js
Merge branch 'master' of https://github.com/range-web/gkh2
Обновил заведение адреса
Merge branch 'master' of https://github.com/range-web/gkh2