XML updates, GUI updates
Merge origin/master
Merge origin/master
consumable as final, Terminal serahkan ke Willy