Issue #113 - update extension with new registration options
Merge branch 'master' into update-carma

Conflicts:
	carma.s4ext
Carma extension has been renamed to Cardiac_MRI_Toolkit
Carma extension renamed to Cardiac MRI Toolkit.
Fix ImageMaker git url
Merge pull request #341 from millerjv/update-carma

Updates to the extensions from CARMA. The extension is now called the Cardiac MRI Toolkit
update SwissSkullStripper

Changed icon url to an image residing on the wiki.
Merge pull request #344 from lorensen/update-SwissSkullStripper

update SwissSkullStripper
add explicit depends on Editor and verify builds on linux and windoze
Merge pull request #345 from pkarasev3/update-KSlice

add explicit depends on Editor, use git-read-only url
update SwissSkullStripper

Following JC's instructions, changed the scmurl to use the git
protocol.
Merge pull request #346 from lorensen/update-SwissSkullStripper

update SwissSkullStripper
ENH: improve SegmentationAidedRegistration module

the advanced parameters are hided by default.
Merge pull request #348 from gaoyi/update-SegmentationAidedRegistration

ENH: improve SegmentationAidedRegistration module
ENH: Updated module names to use CMRToolkit and edited button labels
Fix compilation error on mac
Merge pull request #350 from finetjul/update-ImageMaker

Fix compilation error on mac
BUG: fix windows compilation bug, see detail

the previous version causes compilation error in WIndows. Because there are default parameters in function implementation. this is corrected.
Merge pull request #351 from gaoyi/update-SegmentationAidedRegistration

BUG: fix windows compilation bug, see detail below
Updated module names to use CMRToolkit and edited button labels