Class Mypicture display
Merge branch 'master' of https://github.com/WeTouch/wetouch
reglage conflit
Conflicts:
	view/header.php
	view/tind.php