Merge origin/master

Conflicts:
	FinalProject/Options.xml