Tried to work with bing.. My guess is not today
Merge

Conflicts:
	appengine_server/src/com/owow/rich/retriever/FakeRetriever.java