custom toolbar.phtml
Merge branch 'master' of github.com:duyluong89/magentoking

Conflicts:
	app/design/frontend/magentoking/default/template/catalog/product/list/toolbar.phtml