remove efms.db, efms.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	efms.db
	efms.iml
JS done, fix line_item_edit in controller