Quick fix naikin footer
Merge branch 'quick-fix-footer' into develop