revert to clean master, and sync
revert to clean master, and sync

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