Merge remote-tracking branch 'origin/AutoHelp' into UI

Conflicts:
	src/ticker/logic/HelpManager.java
Merge remote-tracking branch 'origin/AutoHelp' into UI