Commit15072014

build after client changes.