master
conflict resol
Merge branch 'master' into jee

Conflicts:
	SiriPereraMidTermWEBfinal/WebContent/MetricInputForm.jsp