Merge branch 'master' into homepage
adding user profile image to home page..problems
unsuccessful test
conflict resolved
 merge confict resolved
 Fixed image on home page (thanks to Pedrogit add .)
Merge branch 'homepage'