user table and cat form
Merge branch 'lee'
model forms
memcached helper
editor
rm .settings
resolv conflict