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