This is the change made to the gui...
Merge branch 'master' of https://github.com/wi-me/web-gui