Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/java/modal/Accounts.java
	src/java/servlet/Login.java
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/java/modal/Accounts.java
	src/java/servlet/Login.java
Merge origin/master

Conflicts:
	web/WEB-INF/web.xml