login
merge
Merge branch 'other'

Conflicts:
	protected/extensions/userMenu/views/index.php
User work
Fixed host
merge
User work
registration form
Merge branch 'master' of github.com:devlbr/exchange

Conflicts:
	protected/extensions/userMenu/views/index.php
history for users in lbr, delete ferrymans
save new ferryman in db with password
clear unnessesary tabs in users
25 hour and admin menu edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/config/main.php
view
Merge remote-tracking branch 'origin/master'
socket and view with points
socket update
points in item
socket for exchange.lbr.ru