Vue profile.php
Merge branch 'master' of https://github.com/Carma001/SiteProjetsDeViNT

Conflicts:
	application/controllers/user.php
Profile