prepull
OK
OK
Merge branch 'master' of https://github.com/tekoraik/pedidos.git

Conflicts:
	protected/runtime/application.log