Updated ToDo
Fixed some bugs with login
Merge remote-tracking branch 'hts-upstream/master'