Implemented display_get_width/height for OS-X
Merge branch 'cocoa_fs' into iji_2

Conflicts:
	ENIGMAsystem/SHELL/Platforms/Cocoa/CocoaWindow.cpp
Implemented display_get_width/height for OS-X
Merge branch 'cocoa_fs' into iji_2

Conflicts:
	ENIGMAsystem/SHELL/Platforms/Cocoa/WindowFunctions.m