Merge pull request #17 from CapCis/master

12-8-14 12:25pm
Merge pull request #20 from CapCis/master

12.14.2014 11:23
Update #75

created code for dynamic tabs
Update #76
Merge branch 'master' into DRCAPCIS

Conflicts:
	CAPCIS Solution/ExtensionSettings/git/Settings.json
Merge branch 'DRCAPCIS'

Conflicts:
	CAPCIS/DataFolder/data.WakTDef