Feature A implemented
Second change to feature A
Merge branch 'FeatureA'

Conflicts:
	demo-app/src/main/webapp/index.jsp