Corrigiendo templates.
Merge branch 'development' of github.com:CanaimaGNULinux/tribus into development

Conflicts:
	tribus/data/templates/base.html
	tribus/data/templates/footer.html
Merge branch 'development' of github.com:jsfrncscg/tribus into development