Merge
Merge branch 'master' of https://github.com/fast4y/FunBook
Altered search in fun area master page
Merge