Changed Pane management
Merge remote-tracking branch 'origin/master'

Conflicts:
	OCT_Project.pro