Extending inline admin
And adding search
Merge remote-tracking branch 'upstream/master'