Activation, Plans and free publisher
Merge branch 'master' of https://github.com/vim-bogota2/ix

Conflicts:
	protected/modules/administrador/views/usuarios/agents_list.php
Merge branch 'master' of https://github.com/vim-bogota2/ix