[IMPROVEMENT] TabControl handling
[MERGE] conflicts in csproj and ToolBarViewModel fixed