fix phone
fix phone again
Merge branch 'development'

Conflicts:
	Gemfile
	Gemfile.lock