Commit Release4
Merge branch 'Release4'

Conflicts:
	branching_demo/app/partials/phone-detail.html