new height
1
Merge branch 'master' of https://github.com/unine-universe/G2

Conflicts:
	css/moncompte.css
1
Merge branch 'master' of https://github.com/unine-universe/UniVerse

changement des liens internes html

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
J'ai écrit le texte concernant Favoris et Mes Annonces
addaptation des sub box
changements d'affichage
Conflicts:
	css/moncompte.css
	html/monCompte.html
Desgin update
box 4 5
Conflicts:
	main.py
Merge branch 'master' of https://github.com/unine-universe/G2
main.py
changement design
changements 17-04
commit 17-04
Fusion avec G2