Buddhika-Pc changes
Merge branch 'master' of https://github.com/buddhika75/PeMIS.git

Conflicts:
	web/index.xhtml
	web/index1.xhtml
	web/resources/css/maincss.css