asdsda
fix merge errors
Merge branch 'dev' of github.com:zanshi/bricksearch into dev