Merge branch 'master' of https://github.com/EnriqueRE/CITA-Lockers

Conflicts:
	Django_Project/Django_Project/Events/admin.py