registro de candidato
Merge branch 'master' of https://github.com/yurisancollado/ucorp
x
Conflicts:
	protected/runtime/application.log