Clean.
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/products.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/scaffolds.css.scss
	app/controllers/items_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/products_controller.rb
	app/controllers/stocks_controller.rb
	app/models/item.rb
	app/models/product.rb
	app/views/items/_form.html.erb
	app/views/items/edit.html.erb
	app/views/items/index.html.erb
	app/views/items/new.html.erb
	app/views/items/show.html.erb
	app/views/layouts/application.html.erb
	app/views/orders/_form.html.erb
	app/views/orders/edit.html.erb
	app/views/orders/index.html.erb
	app/views/orders/new.html.erb
	app/views/orders/show.html.erb
	app/views/products/_form.html.erb
	app/views/products/edit.html.erb
	app/views/products/index.html.erb
	app/views/products/new.html.erb
	app/views/products/show.html.erb
	app/views/stocks/_form.html.erb
	app/views/stocks/edit.html.erb
	app/views/stocks/index.html.erb
	app/views/stocks/new.html.erb
	app/views/stocks/show.html.erb
	app/views/welcome/index.html.erb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/cookies_serializer.rb
	db/seeds.rb
	public/404.html
	public/422.html
	public/500.html
Lost files and folders.
Lost root files.
Merge branch 'release/nginx-passanger'
Merge pull request #1 from icehofman/master

First Version