Merge pull request #17 from CapCis/master

12-8-14 12:25pm
Merge pull request #19 from CapCis/TLCAPCIS

Tlcapcis
Merge pull request #20 from CapCis/master

12.14.2014 11:23
Merge pull request #21 from CapCis/master

12.14.2014 11:24 Master to Matt
Update #75

created code for dynamic tabs
Update #76
Merge pull request #22 from CapCis/TLCAPCIS

Tlcapcis
Merge pull request #23 from CapCis/MELCAPCIS

Merge pull request #21 from CapCis/master
Merge branch 'master' into DRCAPCIS

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

Conflicts:
	CAPCIS/DataFolder/data.WakTDef
Merge pull request #28 from CapCis/master

12.20.14 12:28