small conflict handle
small conflit handle
delete all word submit in names
combine as one
add view all and delete
change grammer to grammar
modify models
Merge branch 'gybranch'

Conflicts:
	src/signup/models.py
	src/stationary/views.pyc
	src/survey/settings.pyc