Merge pull request #54 from CapCis/master

12.27.14 21:11
Update #128
test
Merge branch 'TLCAPCIS'

Conflicts:
	CAPCIS/DataFolder/data.WakTDef