MBH: updating wiki links
Merge branch 'mattben' into devel

Conflicts:
	web/WEB-INF/views/help/help.jsp
Uncommented the FAQ section in help page