nicolas
Merge branch 'desarrollo'

Conflicts:
	protected/controllers/APORTEController.php
	protected/models/APORTE.php
	protected/runtime/application.log
remover update en admin
Merge remote-tracking branch 'rafael/master'

Conflicts:
	protected/runtime/application.log
	protected/runtime/state.bin
modificaciones aporte