fixing overwritten modal
fixing overwritten modal
merge chargeTo conflicts/expense type argument
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExpensesApp/apps/ExpensesApp/common/js/view/chargeTo.js