20140709 sync

code sync