db cambios mini
Merge remote-tracking branch 'origin/ci' into ci

Conflicts:
	web/application/logs/log-2014-11-24.php