Novo commit!
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
Novo commit!
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
Login/logout implementados!
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/UserController.php
	protected/runtime/application.log
Merge efectuado com sucesso!