upd
Merge branch 'master' of https://github.com/coderiver/vetcentr

Conflicts:
	js/init.js