Pull to embr r100
Merge from embr r100

Conflicts:
	ajax/uploadImage.php
	lib/twitese.php