fixed item bug
Merge branch 'master' into stefan
browse page working
Merge branch 'stefan'