Merge search & table
Update django to 1.6