Merged two projects into this repository 

Upgraded all scripts for current project
Updated shorewall config template file for compliancy with last version