Prepare to merge
Merge forry's fixes, tried fixing some more

Conflicts:
	TV Tracker/.classpath