Wiki is good enough
Merge branch 'master' of github.com:OWOW/rich-page

Conflicts:
	appengine_server/src/com/owow/rich/apiHandler/ApiResponse.java
	appengine_server/src/com/owow/rich/apiHandler/FreebaseHandler.java
	appengine_server/src/com/owow/rich/servlet/SnippetServlet.java

appengine_server/war/WEB-INF/appengine-generated/datastore-indexes-auto.
xml

appengine_server/war/WEB-INF/appengine-generated/indexes/cmljaC1wYWdl/SU
5ERVgx..P/_1e.fnm

appengine_server/war/WEB-INF/appengine-generated/indexes/cmljaC1wYWdl/SU
5ERVgx..P/_1e.tii

appengine_server/war/WEB-INF/appengine-generated/indexes/cmljaC1wYWdl/SU
5ERVgx..P/segments.gen

appengine_server/war/WEB-INF/appengine-generated/indexes/cmljaC1wYWdl/bX
lpbmRleA..P/segments.gen