Replace short with shortType
minifiy
Merge branch 'master' of github.com:Xosofox/IPAS