fix
Merge branch 'master' of https://github.com/indri-indri/SMTE31

Conflicts:
	FinanceControl/FinanceControl/FinanceControl/Base.lproj/Main.storyboard