Merge branch 'release'
Merge branch 'release'
Merge branch 'master' of github.com:fairnopoly/fairnopoly
restructure and implement first basic transaction#edit
improve rake update process
remove duplication in form builder
formatting; improve shopping cart and tests
merge
fix license notice
cart gets transport and payment data from article
expand shopping cart
finish #38 - shopping cart display
Merge branch 'release'

Conflicts:
	Gemfile.lock
	app/models/article/attributes.rb
	app/models/private_user.rb
	app/models/user.rb
	app/models/users/legal_entity.rb
	app/views/articles/show/_article_contents.html.haml
	lib/autoload/sanitize_tiny_mce.rb
	solr/conf/de.xml
	spec/features/performance_spec.rb
	spec/models/article_template_spec.rb
merge
Merge branch 'release'

Conflicts:
	app/helpers/articles_helper.rb
	app/models/user.rb
	app/views/articles/show.html.haml
	app/views/articles/show/_article_contents.html.haml
	spec/features/performance_spec.rb
	spec/models/user_spec.rb
rename articles.rake
Merge branch 'master' of github.com:fairnopoly/fairnopoly
Update README.rdoc
Gemfile update
towards #39 - implement transaction states and working update