Red Alert Git Merge Conflicts

Merge branch 'original' into counterstrike

Conflicts:
	main/general/mission.ini
	main/general/missions.pkt
	main/general/ppaper.cps
	main/general/scg01ea.ini
	main/general/scu01ea.ini
	main/general/title.cps
	main/general/tutorial.ini
	main/movies1/bmap.vqa
	main/movies1/spy.vqa
	main/movies1/toofar.vqa
	main/movies1/trinity.vqa
	redalert/hires/title.pcx
	redalert/local/conquer.eng
	redalert/nchires/bmap.vqp