Revert 4127f0e..a7d0b5c

This rolls back to commit 4127f0e95af41b8161b5bc72d562193641761830.
e
Merge branch 'master' of github.com:OWOW/rich-page

Conflicts:
	appengine_server/.settings/org.eclipse.core.resources.prefs
	appengine_server/war/demo/mobile/techcrunch-demo.html
	appengine_server/war/demo/mobile2/techcrunch-demo.html
	appengine_server/war/old/mobile/techcrunch-demo.html