modified:   README.md
	modified:   components/UserIdentity.php
	modified:   components/behaviors/ETimezoneBehavior.php
Merge branch 'master' of github.com:rootlocal/ETimezoneBehavior

Conflicts:
	components/UserIdentity.php