modified:   lib/python/Plugins/SystemPlugins/Makefile.am
Removed NetworkBrowser from Makefile
Merge remote-tracking branch 'beta/master'