Redirect direito!
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/LibraryController.php
	protected/controllers/UserController.php
	protected/views/user/_form.php
	protected/views/user/create.php
Redirect direito!