Stable Merge

Includes all css and scss changes