Logo & fix link
Merge branch 'master' into dungnguyen
Update CSS
Update CSS
Merge commit '398b61900179214910eeaa2362089ca6e613de88' into dungnguyen

Conflicts:
	shop/protected/modules/shop/views/products/view.php
App name
New data
Merge commit '45a33b8bd06a349af074d84aacb00185745d4bf8' into dungnguyen

Conflicts:
	shop/protected/modules/shop/views/products/view.php