Exclude AceWiki icon and title from sidemenu scrolling
Merge remote-tracking branch 'origin/master' into gfservice

Conflicts:
	src/ch/uzh/ifi/attempto/acewiki/Wiki.java