Merged the android-projects and added stuff to the db-class