Merge pull request #282 from vincentbriglia/master

User search in non-admin removes search header/input
fix for upgrade script
online count fix for anon users
Merge remote-tracking branch 'upstream/master'