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