updated branch version and build scripts
update branch with contributes from trunk and other branches