i didn’t do shit
Merge remote-tracking branch 'origin/master'
small changes in default types
Merge remote-tracking branch 'origin/master'
small changes in global data
Merge remote-tracking branch 'origin/master'
Changed template pictures
Merge remote-tracking branch 'origin/master'