implement sticky footer
Fix merge conflicts
Merge branch 'mattphoto-master'