merge
merged
merge
merged
Bugfixes, interaction between webui and modules now fully working