login code and search code
fixed logintest
Merge branch 'Iris' into Jeroen
login code modified
modified login test
Merge branch 'Iris' into Jeroen
small fixes
merge conflicts