list offer and not offer products
Merge branch 'list_products'

Conflicts:
	build/web/WEB-INF/lib/gson-2.3.jar