Merge origin/first

Conflicts:
	build.xml
	nbproject/ant-deploy.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/java/controller/atm/AtmActions.java
	src/java/controller/atm/AtmCheckBalance.java
	src/java/controller/atm/AtmWithdraw.java
	src/java/controller/atm/AtmWithdrawConfirm.java
	src/java/controller/bank/BankActions.java
	src/java/model/classes/Card.java
	src/java/model/xml/card.hbm.xml
	src/java/model/xml/withdraw.hbm.xml
	web/META-INF/context.xml
	web/WEB-INF/view/atm/AtmCheckBalance.jsp
	web/WEB-INF/view/atm/AtmLogout.jsp
	web/WEB-INF/view/atm/AtmWithdraw.jsp
	web/WEB-INF/view/atm/AtmWithdrawConfirm.jsp
	web/WEB-INF/view/atm/AtmWithdrawInput.jsp
	web/WEB-INF/view/atm/AtmWithdrawInvalid.jsp
	web/WEB-INF/view/atm/AtmWithdrawValid.jsp
	web/WEB-INF/view/atm/atm.jsp
	web/WEB-INF/web.xml
	web/javascripts/atm_javascript.js
	web/javascripts/webapp.js
	web/vendor/bootstrap-3.1.1/test-infra/s3_cache.py
	web/vendor/bootstrap-3.1.1/test-infra/uncached-npm-install.sh