Merge branch '1-phonestore-site-refresh'

Conflicts:
	app/partials/phone-detail.html
Merge branch '4-phonestore-mainpage'
1-R1
Merge branch '1-R1'