Merge remote-tracking branch 'rafael/master'

Conflicts:
	protected/controllers/CREDITOController.php
	protected/runtime/application.log
Merge remote-tracking branch 'David/master'

Conflicts:
	protected/runtime/application.log
Merge David