database sent by email
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/inventory/in.php
	application/views/inventory/index.php