Added Panels
Merge branch 'refs/heads/master' into sidetabs

Conflicts:
	main.js
Merge branch 'refs/heads/sidetabs'