I've merged the most of the two projects, we need to doublecheck. The app is also compatible with the new webservice