avatar
Merge branch 'master' of ssh://git.itransition.com:7999/teamin/teamin

Conflicts:
	www/protected/config/main.php
changed auth forms for new design
add ext EasyImage
change webuser
Merge branch 'master' of ssh://git.itransition.com:7999/teamin/teamin

Conflicts:
	www/protected/components/Controller.php
Merge branch 'master' of ssh://git.itransition.com:7999/teamin/teamin
remove assets
add webuser to config
fix merge bug
Merge branch 'master' of https://git.itransition.com/scm/teamin/teamin

Conflicts:
	www/protected/components/Controller.php
	www/protected/modules/user/controllers/AuthController.php
	www/protected/modules/user/views/auth/login.php
	www/protected/views/layouts/main.php
corrected facebook with LogiN