#1293 added more updates to fix layout issues with the client site theme
Merge branch 'master' of https://github.com/tendenci/tendenci