fix bugs
Merge branch 'welcome'

Conflicts:
	app/controllers/contacts_controller.rb
	app/views/contacts/_users_groups.html.erb
Merge branch 'master' of https://github.com/audibleblink/jailbird
remove phone number uniqueness validation