Started working on error handling in auction class instead of controller.
	modified:   trade/app/models/module/auction.rb
Finished Rework of error handling of creating and editing auctions.
Starting to work on buying auctions...
	modified:   trade/app/controllers/auction_control.rb
	modified:   trade/app/models/module/auction.rb
	modified:   trade/app/models/module/item.rb
Tests for auctions, copied from our implementation at team6
Rework on auction still running... Some issues still now with our holding class.

	modified:   trade/app/app.rb
	modified:   trade/app/models/module/auction.rb
	modified:   trade/app/models/module/user.rb
	modified:   trade/app/models/utility/holding.rb
	modified:   trade/app/models/utility/mailer.rb
Merge branch 'auction_tests' into production
merged the views for search and the store. You can now start a search directly from the store page
	modified:   trade/app/views/items.haml
	deleted:    trade/app/views/search.haml
added a set of quick links to the home page

	modified:   trade/app/public/css/layout.css
	new file:   trade/app/public/images/getting_started/additem.png
	new file:   trade/app/public/images/getting_started/profile.png
	new file:   trade/app/public/images/getting_started/store.png
	new file:   trade/app/public/images/getting_started/youritems.png
	modified:   trade/app/views/home.haml
fixed some embarassing typos in the icons for the quick links

	modified:   trade/app/public/images/getting_started/additem.png
	modified:   trade/app/public/images/getting_started/profile.png
Moved code concerning trades from user class to new Trader superclass.
First version of organization class.
Take a look at the ToDo notes.
	new file:   trade/app/models/module/organization.rb
	renamed:    trade/app/models/module/user.rb -> trade/app/models/module/trader.rb
	modified:   trade/app/models/module/user.rb
First logic for organizations. First organization tests.
	modified:   trade/app/models/module/organization.rb
	modified:   trade/app/models/module/trader.rb
	modified:   trade/app/models/module/user.rb
	new file:   trade/test/organization_test.rb
Fixed auction problem. Auction-items are now bought correctly after the auction expires.
Sheduler checks now every 0.5s for ended auctions.

	modified:   trade/app/app.rb
	modified:   trade/app/models/module/auction.rb
	modified:   trade/app/models/module/organization.rb
	modified:   trade/test/organization_test.rb
users can create organizations, but nor yet edit them. views still need to be done. an organization is still too close to beeing a user.
fixing last commit

The if-line is still needed, if I'm right?
Handling for Admin and User-Lists
Tests for Organization

Admin / Member adding and deletion
Added support for switching account context. This accounts for issue #56

	modified:   trade/app/app.rb
	modified:   trade/app/controllers/user_control.rb
	modified:   trade/app/models/module/organization.rb
	modified:   trade/app/models/module/trader.rb
	modified:   trade/app/models/module/user.rb
	modified:   trade/app/public/css/layout.css
	modified:   trade/app/views/home.haml
	modified:   trade/app/views/layout.haml
Adjusted Controllers to support organisations.

	modified:   trade/app/controllers/auction_control.rb
	modified:   trade/app/controllers/comment_control.rb
	modified:   trade/app/controllers/item_control.rb
	modified:   trade/app/controllers/user_control.rb
Merge branch 'production' of https://github.com/ese-unibe-ch/ese2012-team4 into bsmw

Conflicts:
	trade/app/models/module/auction.rb
	trade/app/models/module/user.rb
Bugfixes, Design fixes, renamed user_control to trader_control

Fixed some bugs in the wishlist caused by the possibility to work as an organization
Adjusted the design of the organization picker to fit the rest of the page

	modified:   trade/app/app.rb
	modified:   trade/app/controllers/item_control.rb
	renamed:    trade/app/controllers/user_control.rb -> trade/app/controllers/trader_control.rb
	modified:   trade/app/public/css/layout.css
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/wishlist.haml
Merge branch 'GMRBBranch' of github.com:ese-unibe-ch/ese2012-team4 into production