Fixade
Fixed some conflicts (since git is stupid, the commits looks like they are a lot, but they are not that many)
fixed some errors with the beans, now the footer is displayed in home-view