Link fixes
Merge branch 'master' of https://github.com/DorsanD/Kuifke_1

Conflicts:
	web/WEB-INF/pages/FirstPage.jsp