Updated to latest build and code from kotuku re...
Removed in rediness for svnsync of production code
