Email and SMS settings to local_settings
Removed multimum
Merge pull request #16 from futurice-oss/email-and-sms-to-settings

Email and SMS settings to local_settings
Merge pull request #17 from futurice-oss/multimum

Removed multimum
Merge branch 'master' into ldap-base-dn

Conflicts:
	fum/settings/multimum.py
	local_settings.py.template