merge in jb-release history after reset to master
tree: 9df81756afd767a5f7bcf6dea01a292191ae1f21
  1. res/
  2. src/