Make offsetx/y public so subclasses can modify
Compile time CCC link

Conflicts:
	build/build.properties