merge master and sticky footer branches