my-acc
Merge remote-tracking branch 'origin/master'

Conflicts:
	my-account.php