Updates
Merge branch 'master' of https://github.com/jdoyle1983/cpScript

Conflicts:
	LightCProto/LightCProto/Token.cs
Update