v1
v2
Merge branch 'master' into f-feesRewrite
no untracked
v3
Merge branch 'master' into f-feesRewrite

Conflicts:
	resources/ats3/components/ats3ButtonManageFees/ats3ButtonManageFees.html
fix
asdl;fkj
v4
v5
v6
v7
Merge branch 'master' into f-feesRewrite
bootstrap version fix
update datepicker config
Merge branch 'master' into f-feesRewrite
Merge branch 'master' into f-feesRewrite

Conflicts:
	resources/ats3/components/ats3FormFees/ats3FormFees.js
Merge branch 'master' into f-feesRewrite