remove whitespace-only lines
Merge branch 'master' into videosomething

Conflicts:
	Classes/osx/LUTPreviewView.m