user_bra_id is added
Invoice In
Invoice In
Merge origin/master

Conflicts:
	resources/log.txt