more merge conflicts resolved
more merge conflicts resolved

anuschka/TrackCat,CodeCatz/TrackCat,anuschka/TrackCat,CodeCatz/TrackCat,livike/TrackCat,anuschka/TrackCat,livike/TrackCat,CodeCatz/TrackCat,livike/TrackCat