merge in jb-release history after reset to jb-dev
tree: b81bb9f536987048b2fd1e370884ed88138f3525
  1. res/
  2. src/