Merge origin/master

Conflicts:
	src/java/control/BankContractBean.java
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/java/entities/Assembler.java
Merge origin/master