Merged apps, changed package name, added alot of features