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

Conflicts:
	www/protected/config/main.php
	www/protected/modules/user/models/User.php
restore app.js
finished merge
v0.0.1
v0.0.1 fix 1