Merge origin/master

Conflicts:
	src/java/servlets/Factory.java
Merge origin/master

Conflicts:
	src/java/servlets/Factory.java
Merge origin/master
Merge origin/master

Conflicts:
	src/dto/DTOAccount.java
	src/dto/DTOMoneyMarketAccount.java
	src/dto/DTOPerson.java
	src/dto/DTOPersonDetail.java
	src/dto/DTOTimeDepositAccount.java
	src/dto/DTOTransaction.java
	src/dto/DTOTransactionDetail.java
	src/dto/DTOUser.java
Merge origin/master
Merge origin/master

Conflicts:
	src/java/control/BankContractBean.java