update
Merge branch 'master' of github.com:lehoangduc/project

Conflicts:
	catalog/view/theme/mbe/images/backgrounds/bg_filter_bar.png
	catalog/view/theme/mbe/images/backgrounds/bg_filter_header.png
update