cosas*
Merge pull request #11 from Nataly/master

todo
xxx
Merge remote-tracking branch 'origin/master' into nata

Conflicts:
	protected/runtime/application.log
log
Merge branch 'nata' of https://github.com/Nataly/siam into nata

Conflicts:
	protected/runtime/application.log
log
Merge branch 'nata' into oclean

Conflicts:
	protected/runtime/application.log
Merge pull request #12 from Nataly/oclean

Oclean