fix phone and create action method
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/phone.rb