adding combo_tabs
lots of refactoring related to main_container
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ninja_ide/gui/main_panel/main_container.py
first iteration of main container refactoring
Merge pull request #1349 from diegosarmentero/master

first iteration of main container refactoring