Working on Dozer mapping framework
Merge branch 'master' into dev-issue-#32

Conflicts:
	BargainHunterWS.iml
	pom.xml
Create greeting web page