merge the two apps, change package name of my app and lots of new features