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