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