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