Merge origin/first into first

Conflicts:
	nbproject/project.properties
	src/java/common/Authenticate.java
	src/java/controller/atm/AtmActions.java
	src/java/model/classes/Account.java
	src/java/model/classes/Card.java
	src/java/model/classes/Transaction.java
	src/java/model/classes/Withdraw.java
	src/java/model/xml/deposit.hbm.xml
	src/java/model/xml/withdraw.hbm.xml
Merge origin/first into first

Conflicts:
	nbproject/project.properties
	src/java/common/Authenticate.java
	src/java/controller/atm/AtmActions.java
	src/java/model/classes/Account.java
	src/java/model/classes/Card.java
	src/java/model/classes/Transaction.java
	src/java/model/classes/Withdraw.java
	src/java/model/xml/deposit.hbm.xml
	src/java/model/xml/withdraw.hbm.xml
Merge origin/first into first

Conflicts:
	nbproject/project.properties
	src/java/common/Authenticate.java
	src/java/controller/atm/AtmActions.java
	src/java/model/classes/Account.java
	src/java/model/classes/Card.java
	src/java/model/classes/Transaction.java
	src/java/model/classes/Withdraw.java
	src/java/model/xml/deposit.hbm.xml
	src/java/model/xml/withdraw.hbm.xml