Merge origin/master

Conflicts:
	src/main/java/ActionController/ApplicationViewController.java
	src/main/webapp/WEB-INF/jsp/application.jsp
	src/main/webapp/WEB-INF/jsp/applicationList.jsp