Merge branch 'master' into user_registration

Conflicts:
	sim/settings.py
Merge branch 'user_registration' of https://github.com/ireynolds/sms-immunization-manager into user_registration

Conflicts:
	sim/settings.py
Merge branch 'master' into user_registration

Conflicts:
	sim/settings.py
renamed UserProfile model to ContactProfile
Merge pull request #52 from ireynolds/user_registration

User registration