Added comments to code, added pictures on portlets and cleaned the code
Merge branch 'master' of https://github.com/ericSaksa/CapstoneLab

Conflicts:
	JavaTunes-portlet/docroot/WEB-INF/classes/com/purchaseOrders/PurchaseOrdersForm.class
	JavaTunes-portlet/docroot/WEB-INF/src/com/purchaseOrders/PurchaseOrdersForm.java
	JavaTunes-portlet/docroot/html/inventoryform/view.jsp
	JavaTunes-portlet/docroot/html/inventorygrid/view.jsp
solved a conflict