Latest changes to Contact Information
Fix schema merge issue. Merge branch 'master' of github.com:okinoz/sample_app

Conflicts:
	db/schema.rb