Merge origin/master

Conflicts:
	BankingSystemNB/src/gui/CreateATMCard.form
	BankingSystemNB/src/gui/CreateATMCard.java