working on layout of products view
added the view file
Pull and resolve conflicts in local.xml
Finished wireframe for products pages
Pull dev and resolve conflicts.
modified homn page, inluding slider, footer and general margin
changed the general color and changed the logo
Merge branch 'custom-home_page' into dev
resolved conflict from csv local.xml
footer is done
Finished Styling of product detail page
did some translate and home page color and border customization
Pull develop and resolve conflicts
Merge branch 'custom-product-detail' into dev
customized the color in home page
changed some of the home page css style and add more translate
implemented the brand list in the home page, added own block and template
modified brands block and template, make it stronger
fixed the brand list style, each of the brand is center in the li now