Testing new design
Merge branch 'master' of https://github.com/Patcher56/PatchPlay

Conflicts:
	lua/patchplay/client/panel_functions.lua