test
test
Merge branch 'master' of http://github.com/hoangsu/Homezone

Conflicts:
	skin/frontend/default/homezone/css/styles.css