Change location of pictures and get rid of home module
Merge remote-tracking branch 'origin/master' into deploy