Remote_dev
Merge branch 'Remote_Dev_X' into Dev_X

Conflicts:
	main.cpp

Signed-off-by: TheFox <0thefox0@gmail.com>