fix etc
fix conflict
enable ajax when search
Merge pull request #9 from myoan/search

Search