CrunchBASE new view
Merge

Conflicts:
	appengine_server/src/com/owow/rich/servlet/SnippetServlet.java
	appengine_server/war/templates/common.soy