SW: Add CWL scope type
Merge branch 'master' of git.assembla.com:chipwhisperer