Core app finished
Merge pull request #11 from QTDBLabs/sort-by_main-view

Update master from sort-by_main-view