Dev-freeze --> Master staging [WE'RE GOING LIVE]

Approaching point we will be ready to merge. Last few bug fixes left to do.