updating with latest db schema
moving support for using view instead of sites table into concerns
Merge branch 'master' into get-morevariables