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

Conflicts:

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