Commit so I can merge
Merge remote-tracking branch 'octotep/master'
Merge remote-tracking branch 'numberQ/master'
Merge remote-tracking branch 'forry/master'

Conflicts:
	TV Tracker/.classpath
	TV Tracker/.gitignore
	TV Tracker/src/com/goddammitus/tvtracker/client/TV_Tracker.java
Fixed buildpath. AGAIN.
Fixed more stupid errors. Thanks EGit.
Merge remote-tracking branch 'decker/master'
Merge remote-tracking branch 'decker/master'
comment results of merge
Merge remote-tracking branch 'numberQ/master'
Merge remote-tracking branch 'numberQ/master'
removed case sensitivity when typing username to log in
Merge remote-tracking branch 'numberQ/master'
Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'decker/master'
Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'DMuckerman/master'
Changed password field to actual password field