Merge origin/master

Conflicts:
	src/java/sit/bank/model/UserEBank.java