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