Frontend updates
Merge branch 'master' of https://github.com/thenhkid/icsciences

Conflicts:
	src/main/webapp/WEB-INF/jsp/informationPages/apps/evfApp.jsp