modal transaction
Merge branch 'master' of https://github.com/gilz688/POSS

Conflicts:
	app/views/item/index.blade.php
merge
merged