ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/view/budget/TestataAdd.js
ok