Important Update , poi and some view
resolve conflits into jollyjumper
fix #{]{@]@ de conflit
The Final conflit resolution ?