Started working on the sidebar
Merge branch 'master' of https://github.com/SnowblindFatal/tim

Conflicts:
	src/general/Resources.cpp