merged to dev
search api bug
CSRF bug fixed
merge from dev