Added Ransack search
Merge branches 'master' and 'ransack'