Merge branch 'hotfix-0.8.1'
removed grid from partnerships
floating line fix
Merge branch 'hotfix-0.8.2' into develop