added few classes
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
fixed conflicts
Merge branch 'userena'
added email_settings to git ignore
Merge branch 'more-models'

Conflicts:
	.gitignore
	NexToU/settings.py
fixed conflicts
added category, needs, schedule and some templates
fixed some errors
fixed conflicts
fixed the activity list template

should be working...
added template for signing
Templates for signin and signup
Merge branch 'templating'