2013/8/8 20:31
2013/8/8 20:31
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/bootstrap.min.js
	protected/components/UserIdentity.php
	protected/models/User.php