fixed tokens
Merge branch 'master' of https://github.com/rttag/Collage
fix RSP
Merge branch 'master' of https://github.com/Eyescale/Collage
Merge branch 'master' of https://github.com/rttag/Collage

Conflicts:
	co/localNode.cpp