Merge origin/master

Conflicts:
	src/dk/cphbusiness/bank/contract/BankManager.java
Merge origin/master

Conflicts:
	src/dk/cphbusiness/bank/contract/BankManager.java
Merge origin/master
changed style back to employee css for all employee jsp pages