Buttons on the homepage
Merge branch 'default' of https://github.com/cbretton/SINF2255.git into
default

Conflicts:
	c4c-web/src/main/java/be/uclouvain/ingi/sinf2255/group2/control/impl/HomeContentController.java
	c4c-web/src/main/java/be/uclouvain/ingi/sinf2255/group2/ui/StructuredView.java
Merge branch 'default' of https://github.com/cbretton/SINF2255.git into
default

Conflicts:
	c4c-web/src/main/java/be/uclouvain/ingi/sinf2255/group2/control/impl/PersonalNetworkController.java