Merge branch 'more-models' of https://github.com/garcianavalon/NexToU into more-models

Conflicts:
	activitynetwork/models.py
Merge branch 'more-models' of https://github.com/garcianavalon/NexToU into more-models

Conflicts:
	activitynetwork/models.py