.
Merge branch 'master' of https://github.com/OWOW/rich-page

Conflicts:
	appengine_server/.classpath
	appengine_server/src/com/owow/rich/Rich_Snippet.java
	appengine_server/src/com/owow/rich/entity/NameExtractor.java
	appengine_server/src/com/owow/rich/test/NameExtractorTest.java
	appengine_server/war/WEB-INF/classes/com/owow/rich/Rich_Snippet.class
	appengine_server/war/WEB-INF/classes/com/owow/rich/extractors/EntityExtractor.class
	appengine_server/war/WEB-INF/classes/com/owow/rich/extractors/SearchTermExtractor.class
	appengine_server/war/WEB-INF/classes/com/owow/rich/test/SearchTermExtractorTest.class