Fixed a broken link to SysInfo/Composite/General when activating the WebServer module
Fixed a broken link to SysInfo/Composite/General when activating the WebServer module
Merge from master
Fixed layout of the new module skel
Added a missing dependency on devscripts package
Merge branch 'cperello/minor-fixes'

Conflicts:
	main/core/ChangeLog