trans grid system to xs
Merge branch 'master' of https://github.com/popsup/popsup

Conflicts:
	protected/views/hotdeal/item.php