integration antho
resolution conflits
Merge origin/master

Conflicts:
	PromoCoupon-war/nbproject/project.xml