wtf
AccountTest working
Merge remote-tracking branch 'decker/master'

Conflicts fixed:
	TV-Tracker-Model/src/com/tvtracker/model/Account.java