agregando controladores angular en templates por default
Merge branch 'development' of github.com:CanaimaGNULinux/tribus into development

Conflicts:
	tribus/web/processors.py
debugueando
Merge branch 'development' of github.com:CanaimaGNULinux/tribus into development

Conflicts:
	tribus/data/templates/profile/profiles.html