test2
Merge origin/master

Conflicts:
	Distributed/BankFrontend/src/java/servlets/AccountValidator.java