shrink up
Merge remote-tracking branch 'upstream/master'
bug configs
Merge remote-tracking branch 'upstream/master'
fix view
Merge remote-tracking branch 'upstream/master'
add color variables
change new button
translation modif
up upstream | up controller