Merge origin/master

Conflicts:
	Bank-Manager/Bank-Manager/Customer.h
Merge origin/master