main time line almost done
merge
fix list view out of memory
merge
add avatar
temp version
Merge branch 'master' of https://github.com/BananaBaby/Banana-baby
temp commit