some changes
Merge branch 'master' of https://github.com/kailashnagarkoti/JavatunesP-portlet

Conflicts:
	docroot/html/purchaseordercontents/view.jsp