Fix avatar edit permissions (by Jerôme Bakker)
Merge branch '18_avatar' into 1.8
preparing 1.8.16 release
Merge branch '1.8'

Conflicts:
	version.php