Testing followers
pierce merge
more merge fixes (hopefully)
invalid username or pass message displayed
Merge branch 'test'