incomplete admin

Signed-off-by: Martin Oyola <knifesk@gmail.com>
asd

Signed-off-by: Martin Oyola <knifesk@gmail.com>
Merge branch 'master' of 192.168.1.25:Desarrollo/oscasan.dev
saSDASD

Signed-off-by: Martin Oyola <knifesk@gmail.com>
Merge branch 'refs/heads/admin-knf'

Conflicts:
	app/class/mysqlpdo.class.php

Signed-off-by: Martin Oyola <knifesk@gmail.com>
removing temps

Signed-off-by: Martin Oyola <knifesk@gmail.com>
copia seguridad
Signed-off-by: WWCelta <nycoag92@gmail.com>
Seccion Nosotros y Oscatrans

Signed-off-by: WWCelta <nycoag92@gmail.com>
Merge branch 'master' of 192.168.1.25:Desarrollo/oscasan.dev
merged last nico y admin

Signed-off-by: Martin Oyola <knifesk@gmail.com>