fixes
Merge branch 'develop'
Merge branch 'master' of github.com:kossgreim/ysa-activity into vetal-develop
I trying to make search #3 (with Ajax)