commit 27/06/2013 desde aptan: Modificacion modelo
commit aptana
Merge branch 'master' of https://github.com/kurtizo/Mambo

Conflicts:
	Mambo/manejogit.txt
	Mambo/mysite/settings.py
	Mambo/mysite/settings.pyc
	Mambo/mysite/templates/base.html
	Mambo/mysite/templates/login_activate.html
	Mambo/mysite/urls.py
	Mambo/mysite/urls.pyc
	Mambo/mysite/views.py
	Mambo/mysite/views.pyc
	mysite/manage.py
	mysite/settings.py
	mysite/settings.pyc
	mysite/templates/base.html
	mysite/urls.py
	mysite/urls.pyc
	mysite/views.py
	mysite/views.pyc