Merge pull request #1 from techdivision/0.5.8-beta

merging upstream
Merge remote-tracking branch 'upstream/0.5.8-beta' into 0.5.8-beta
Removed webapp surveillance from config file
Merge pull request #44 from wick-ed/0.5.8-beta

reviewed with 0.5.8-beta7