Merge pull request #60 from CapCis/master

12.27.14 10:19
Update #138
Merge branch 'TLCAPCIS'

Conflicts:
	CAPCIS/DataFolder/data.WakTDef