admin
socket url
Merge branch 'master' of github.com:devlbr/exchange

Conflicts:
	protected/views/layouts/main.php