asd
asd
Merge branch 'master' of https://github.com/anibalbastias/SEU
asd
asd
Merge branch 'master' of https://github.com/anibalbastias/SEU

Conflicts:
	protected/runtime/application.log
asd
asd
asd
Merge branch 'master' of https://github.com/anibalbastias/SEU
asd
asd
asd
Merge branch 'master' of https://github.com/anibalbastias/SEU
Adaptacion Vista Index Usuario