Making changes for release #1
Merge branch 'origin/feature_1'

Conflicts:
	app/partials/phone-detail.html