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