- tryed solving conflicts (not tested)
- fixed bug for setUpDB
- fixed bug for starting and hiding loading screen