Fixed conflicts.
Crap progress on multiplatform streams install.
Moved theme schema to core.
Merge branch 'stream-maybe-multiplatform' into 2.3/develop
Lets keep user salt around until 3.0.
Files index actually loads now. CSS effects dialog box though.
These fields should have a type, or postgres gets upset.
Debug marker for Ryan.