Merge branch 'hotfix/fix-buttons'
CSS files reverted to the latest DiscoStore working copy
fix featured
Merge branch 'hotfix/merge-fixs-in-css' into develop

Conflicts:
	css/featured.css
	css/iphone.css
fix iphone css
fix html in contact-us.html
fix html in disco.html
fix html breadcrumbs
fix list
Merge branch 'develop' into hotfix/merge-fixs-in-css

Conflicts:
	contact-us.html
	disc.html
Merge branch 'hotfix/merge-fixs-in-css' into develop