pika kommit
Merge branch 'master' into haku
nopee kommit
Merge branch 'master' into haku
pika kommit
Merge branch 'master' into haku
search functions, search page stuff