udpate z5
Merge branch 'master' of https://github.com/yuanwang1980/zenfone

Conflicts:
	websites/global/products/Qc2m6xG61KhYr2ep/css/style.css

websites/global/products/Qc2m6xG61KhYr2ep/img/beauty-touch/bg-padfone-mi
ni-gorilla-3.jpg

websites/global/products/Qc2m6xG61KhYr2ep/img/beauty-touch/padfone-mini-
gorilla-glass.png

websites/global/products/Qc2m6xG61KhYr2ep/img/responsiveness/padfone-min
i-glow.png

websites/global/products/Qc2m6xG61KhYr2ep/img/responsiveness/padfone-min
i-reflection.png

websites/global/products/Qc2m6xG61KhYr2ep/img/responsiveness/padfone-min
i.old.png
	websites/global/products/Qc2m6xG61KhYr2ep/js/page_animation.js
	websites/global/products/Qc2m6xG61KhYr2ep/js/page_data.js
	websites/global/products/Qc2m6xG61KhYr2ep/src/sass/page/_accessory.scss

websites/global/products/Qc2m6xG61KhYr2ep/src/sass/page/_beauty-touch.sc
ss

websites/global/products/Qc2m6xG61KhYr2ep/src/sass/page/_pixelmaster.scs
s

websites/global/products/Qc2m6xG61KhYr2ep/src/sass/page/_responsiveness.
scss