adaptando etiquetas jquery a angular
agregando controlador para pagina search
Merge branch 'development' of github.com:CanaimaGNULinux/tribus into development

Conflicts:
	tribus/common/recorder.py
	tribus/data/static/js/full/controllers.angular.js
Merge branch 'development' of github.com:CanaimaGNULinux/tribus into development
modificando template de cambio de contraseña
agregando internacionalizacion
Merge branch 'development' of github.com:CanaimaGNULinux/tribus into development

Conflicts:
	tribus/data/templates/registration/form_errors.html
modificando templates