fixed bug
Merge branch 'master' of github.com:idimovski/hemometalInvoice

Conflicts:
	war/proEdit.jsp
implemeted latest changes, fixed search item from pro and stype changes. added admin and user security