Mostly done with db work.  Time to work on admin/frontend
Merge branch 'master' into smugmug