1er commit
Merge branch 'master' of https://github.com/yurisancollado/frioclinsys

Conflicts:
	protected/runtime/application.log