lalal
asfas
Merge branch 'master' of https://github.com/kivinju/ProductCompare

Conflicts:
	WebContent/META-INF/context.xml
	src/applicationContext.xml