asd
Merge branch 'master' of https://github.com/joe1990/banksimulation.git

Conflicts:
	PivotBankSimulation/bin/ch/bfh/ti/pbs/gui/WindowContent.bxml
	PivotBankSimulation/src/ch/bfh/ti/pbs/gui/WindowContent.bxml