Merge pull request #58 from CapCis/master

12.27.14 10:17
Merge pull request #60 from CapCis/master

12.27.14 10:19
Update #138
Update #138
Merge pull request #61 from CapCis/DRCAPCIS

Drcapcis
Merge pull request #62 from CapCis/MELCAPCIS

Melcapcis
Merge branch 'TLCAPCIS'

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

12.28.14 7:46