meer profile edit zooi
Merge branch 'master' of https://github.com/QuantumHive/DataDate

Conflicts:
	application/controllers/profile.php