updated alot, login should work, but search is not
Merge remote-tracking branch 'origin/Pistachitos' into Pistachitos