Colour assets
Interface sort compare
Merge branch 'master' of https://github.com/QFrameTK/TME
Merge branch 'master' of https://github.com/QFrameTK/TME
Equipment short ids
Merge branch 'master' of https://github.com/QFrameTK/TME
Fix price order
Merge branch 'master' of https://github.com/QFrameTK/TME