Merge branch 'master' into flat-ui
Update read me with user testing login information
Merge branch 'flat-ui'