add bargain layout
update pojo for bargain ,builder
Merge branch 'developer'

Conflicts:
	pom.xml