manual - make content div not fixed
org related problems, refs #849
Merge branch 'master' into integration