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