added models and active_admin/devise support
Merge branch 'master' of https://github.com/detergen/xduck

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/application_controller.rb
	app/controllers/boms_controller.rb
	app/controllers/products_controller.rb
	app/models/bom.rb
	app/models/product.rb
	app/views/layouts/application.html.erb
	config/application.rb
	config/environments/development.rb
	config/routes.rb
	db/schema.rb