Merge branch 'hotfix/nilerror'
Merge branch 'release/0.3.1'
moved the footer "back" (z-index:-1) so it is not in the way when in a small browser window. it will still be ugly, but usable.
Merge branch 'hotfix/footer_is_in_the_way' into develop