merge independentfrontend.demo