merge
Merge branch 'master' of https://github.com/earthlinkdesign/csp

# By trungjc
# Via trungjc
* 'master' of https://github.com/earthlinkdesign/csp:
  style detail product
  update stylehsseet opncart
  config new pages
  update databse, add inner pages

Conflicts:
	t3-assets/dev/templates.t3_blank.less.style.less.css