images
fixed footer to clear
merge conflicts resolved
header and footer fix, flash message fix
Merge branch 'honeybooboo' into develop