Merge origin/master

Conflicts:
	BankVulnerableApp/src/java/com/demo/bank/vulnerable/control/actions/LoginAction.java
	BankVulnerableApp/src/java/com/demo/bank/vulnerable/listener/ContextListener.java