offers images
offers images
Merge branch 'master' of github.com:cloice/cloice

Conflicts:
	client/control_panel/offers/offers.html
Merge branch 'master' of github.com:cloice/cloice

Conflicts:
	client/control_panel/offers/offers.html