up
Merge branch 'master' of github.com:snasir/styleClub

Conflicts:
	app/View/Products/admin_edit.ctp