I dunno
Merge remote-tracking branch 'chris/master'
Readded missing tests folder, even tho that's local only
I dunno
Readded missing tests folder, even tho that's local only
delete contents of unit cache
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'chris/master'

Conflicts:
	TV Tracker/.classpath
Merge remote-tracking branch 'chris/master'

Conflicts:
	TV Tracker/.classpath
Added serial IDs to get rid of warnings
Fixed trashed buildpath AGAIN
Added .classpath to .gitignore
Added .classpath to .gitignore
added .classpath to .gitignore
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'chris/master'
Trying to avoid conflicts
Merge remote-tracking branch 'chris/master'

Conflicts:
	TV-Tracker-Model/src/com/tvtracker/model/MediaListProgress.java
Fixed classpath error