app: estimate::catalog
Merge branch 'estimate' of git://github.com/skyline34r/abstract-accounting into HEAD

Conflicts:
	app/assets/javascripts/application.js.coffee
	app/views/home/index.html.erb
	config/locales/views/estimates/en.yml
	config/locales/views/estimates/ru.yml
app: view boms by catalog
app: view price lists by catalog
app: select catalog with dialog on bom creating page
Merge remote branch 'kolya/estimate' into estimate

Conflicts:
	app/assets/javascripts/application.js.coffee
	app/assets/javascripts/estimate/bo_m.js.coffee
	app/assets/javascripts/estimate/price_lists.js.coffee
	app/controllers/estimate/bo_ms_controller.rb
	app/controllers/estimate/price_lists_controller.rb
	config/locales/views/estimate/en.yml
	config/locales/views/estimate/ru.yml
	config/routes.rb
	db/schema.rb
Merge remote branch 'igorku/estimate' into estimate

Conflicts:
	app/assets/javascripts/application.js.coffee
	app/controllers/estimate/price_lists_controller.rb
	config/routes.rb
	db/schema.rb