update demo

update demo
tuan updateupdate

tuan
Merge branch 'master' of https://github.com/ketuan/citizenFull

Conflicts:
	app/design/frontend/default/citizen/layout/catalog.xml