mac fixes
Merge branch 'master' into local
fixed crash
Revert "mac fixes"

This reverts commit fd3feb27b257d9c5e99173f4dbb4986bfee322da.

Conflicts:
	src/main.cpp