Merge branch '#58-user-Information' into #76-HoverEdit
.
Merge branch 'master' into #76-HoverEdit
editbox done
close #78
логотип компании
fix ошибка сортировки в биндере
Merge branch 'master' into #76-HoverEdit
..
Merge branch '#76-HoverEdit' into #58-user-Information

Conflicts:
	src/wap/public/css/controls.css
	src/wap/public/js/controls.js
	src/wap/server/webrender.d
	src/wap/views/persons/editPerson.d
	src/wap/views/persons/personInformation.d
	src/wap/views/tests/user_information.d
backup