merged attempt to fix wrong profile image bug
merged bugfixes
merged limit database size fix
merge conflicts