Merge origin/master

Conflicts:
	src/java/com/myapp/struts/Database.java
	src/java/com/myapp/struts/LoginAction.java
	web/WEB-INF/struts-config.xml
	web/login.jsp