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