all activities list
Merge branch 'intergrating-templates' of https://github.com/garcianavalon/NexToU into intergrating-templates

Conflicts:
	accounts/models.py