Merging all the javascript changes into the new splitup apps