Changed all things for the preview back to normal
Merge remote-tracking branch 'origin/master'