Merge branch 'master' of C:\Users\owner\IdeaProjects\BlazeSwing with conflicts.
moved toolbar to line editor panel
moved toolbar to line editor panel
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
its here