Act
Merge branch 'master' of github.com:nelsonramirez/PruebaYii

Conflicts:
	modelo/datos1.mwb
	protected/controllers/CiudadesController.php
	protected/models/Ciudades.php
	protected/models/Experiencia.php
	protected/models/Folio.php
	protected/models/Usuarios.php
	protected/views/ciudades/_form.php
	protected/views/ciudades/_search.php
	protected/views/ciudades/_view.php
	protected/views/ciudades/admin.php
	protected/views/ciudades/index.php
	protected/views/folio/_form.php
	protected/views/folio/_search.php
	protected/views/folio/_view.php
	protected/views/folio/admin.php
	protected/views/folio/view.php
	protected/views/layouts/main.php
	protected/views/usuarios/_form.php
	protected/views/usuarios/_search.php
	protected/views/usuarios/_view.php
	protected/views/usuarios/admin.php
	protected/views/usuarios/view.php