update manual
Re-generate assets
Merge branch 'master' into new_ck_core2