Added delay when hovering (with .apply)
Added target blank in wiki.html
Made button unclickable
Added form in wiki.html
commit: Thomas
merged master onto karma

	added delay for wikilist
	catagories list added
	tests also added

Conflicts:
	client/SPA/index.html
	client/SPA/wiki/wiki.html
	client/SPA/wikiList/wikiList.html

	Commit by: Robert, Simon, Thomas