Gave Marvin login better responses
Merge branch 'marvin-dev'