Trying to avoid conflicts
Merge remote-tracking branch 'chris/master'

Conflicts:
	TV-Tracker-Model/src/com/tvtracker/model/MediaListProgress.java
Fixed classpath error
Fixed duplicates/merge errors
Terrible, terrible fix for stupid GWT/Chrome problem.
Merge remote-tracking branch 'DMuckerman/master'
Merge remote-tracking branch 'numberQ/master'
Merge remote-tracking branch 'numberQ/master'
merged successfully?
Updated the Readme
Fixed a typo in the readme
Merge remote-tracking branch 'numberQ/master'

Conflicts:
	TV Tracker/src/com/goddammitus/tvtracker/client/TV_Tracker.java
Merge remote-tracking branch 'chris/master'
Merge remote-tracking branch 'forry/master'
Contains HomePageView