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

Conflicts:
	appengine_server/src/com/owow/rich/Manager.java
	appengine_server/src/com/owow/rich/storage/Storage.java