login
merge
User work
registration form
Merge branch 'master' of github.com:devlbr/exchange

Conflicts:
	protected/extensions/userMenu/views/index.php