Commit so I can merge
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'
Merge remote-tracking branch 'decker/master'
Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'DMuckerman/master'
Changed password field to actual password field
Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'DMuckerman/master'
Basis of user's media list implemented on home page view.

Changed Progress int returns to Integers and fixed JUnit tests
accordingly.
Fixed mis-aligned and cut off password form. Also fixed tabbing order on
page.
Merge remote-tracking branch 'DMuckerman/master'