dummy commit
lots of changes. it probably doesn't work right now.
Merge completed. This commit comes in the process of moving to GAE Datastore, so, again, doesn't probably work.