Added some 'TODO' explanation for Constantine.
Temporary loginUser method so Constantine can test the username/password
command classes.
Tried to resolve conflicts from fetching Duc's code.
Merge remote-tracking branch 'origin/master'