Added several changes to the models to include saving to the database
rather than a dictionary
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	botvin_lifeskills/models.py
	botvin_lifeskills/views.py