Merge work.
Merge branch 'master' of https://github.com/TashPotatoes/STIMulate

Conflicts:
	Merged/Include/SideBar.inc