Merge develop into refactor-syntax_unicode
Merging in the update for the platform player
[[ MERG-6.7 ]] Fixed Linux's issues
[[ MERG-6.7 ]] Fixes Windows' issues
Merge branch 'refactor-syntax_unicode' into refactor-syntax_unicode_6.7_platform_merge

Conflicts:
	engine/engine.xcodeproj/project.pbxproj
[[ MERG-6.7 ]] Added the player in the server's files
[[ MERG-6.7 ]] Fixes Mac Quicktime loading issue