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

Conflicts:
	appengine_server/war/client/contentscript.js