Merge branch 'release/1.0.4' into develop
Merge branch 'hotfix/1.0.5' into develop
allow filtering by site and site group in admin
add sites to modelbase __unicode__ to help with multi-locale content management
Set title, description and keywords meta tags on detail page.
 is now aware that multiple sites may comprise a logical site.
Ignore everything from # character onwards in view modifier urls
Use correct attribute name
Prep for release
Merge branch 'release/1.0.6'