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