Fix pkg-plist
Fix appweb port
Merge remote-tracking branch 'upstream/master'