add edit profile
Merge branch 'master' of https://github.com/marcyliao/velidate

Conflicts:
	utility/Properties.class.php