Fixed conflicts and minor changes

* sys_tty updated.

Conflicts:
	rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
	rpcs3/Emu/SysCalls/lv2/SC_Event_flag.cpp
	rpcs3/Emu/SysCalls/lv2/SC_GCM.cpp
	rpcs3/Emu/SysCalls/lv2/SC_Heap.cpp
	rpcs3/Emu/SysCalls/lv2/SC_Memory.cpp
	rpcs3/Emu/SysCalls/lv2/sys_memory.cpp
	rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp
	rpcs3/Emu/SysCalls/lv2/sys_tty.cpp
	rpcs3/Loader/ELF64.cpp
	rpcs3/emucore.vcxproj.filters