cambios
Merge branch 'master' of https://github.com/urkh/agenda

Conflicts:
	agenda/application_admin.py