Merge app and jadaBox repos.