Merge branch 'development' of github.com:ese-unibe-ch/ese2012-team6 into suspend

Conflicts:
	trade/app/controllers/main_ctrl.rb
Merge branch 'development' of github.com:ese-unibe-ch/ese2012-team6 into suspend

Conflicts:
	trade/app/controllers/main_ctrl.rb
Email to seller when he sold an item
Improved admin transaction statistics

	modified:   trade/app/controllers/activity_logger_ctrl.rb
	modified:   trade/app/controllers/main_ctrl.rb
	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/store/purchase.rb
	new file:   trade/app/purchases_Tue_Dec__4_19:47:12_2012
	modified:   trade/app/views/admin_transaction_overview.haml
	modified:   trade/app/views/all_activities.haml
pulled development.
deleted csv

	deleted:    trade/app/purchases_Tue_Dec__4_19:47:12_2012
Added .csv files to gitignore

	modified:   .gitignore
	modified:   trade/app/controllers/activity_logger_ctrl.rb
auction: last bug fixed

Merge remote-tracking branch 'origin/development' into development

Conflicts:
	trade/app/controllers/activity_logger_ctrl.rb
auction: last bug fixed
popup in the item_search distinguish between auctions and fixed items. Also fixed bug: user cannot buy own item.
popup in the item_search distinguish between auctions and fixed items. Also fixed bug: user cannot buy own item.
popup in the item_search distinguish between auctions and fixed items. Also fixed bug: user cannot buy own item.
popup in the item_search distinguish between auctions and fixed items. Also fixed bug: user cannot buy own item.
Fixed admin system value input

	modified:   trade/app/controllers/main_ctrl.rb
	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/helpers/exceptions/exception_text.rb
	modified:   trade/app/views/admin.haml
Merge branch 'development' of github.com:ese-unibe-ch/ese2012-team6 into development

Conflicts:
	trade/app/models/helpers/exceptions/exception_text.rb

	modified:   .gitignore
	modified:   trade/app/controllers/activity_logger_ctrl.rb
	modified:   trade/app/controllers/main_ctrl.rb
	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/helpers/exceptions/exception_text.rb
	modified:   trade/app/models/store/purchase.rb
	modified:   trade/app/models/store/trader.rb
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/admin_transaction_overview.haml
	modified:   trade/app/views/all_activities.haml
	modified:   trade/app/views/all_items.haml
	modified:   trade/app/views/all_organizations.haml
	modified:   trade/app/views/all_users.haml
	modified:   trade/app/views/auction_store.haml
	modified:   trade/app/views/item_store.haml
	modified:   trade/app/views/partials/item_popup.haml
	modified:   trade/app/views/partials/pagination.haml
	new file:   trade/app/views/partials/pagination2.haml
	modified:   trade/app/views/search_items.haml
	modified:   trade/app/views/store.haml
	modified:   trade/app/views/user_profile.haml
	modified:   trade/test/bidding_test.rb
Improved item popup for auction items and added popups to item and auction store

	modified:   trade/app/models/store/trader.rb
	modified:   trade/app/views/auction_store.haml
	modified:   trade/app/views/item_store.haml
	modified:   trade/app/views/partials/item_popup.haml
	modified:   trade/app/views/search_items.haml
Merge branch 'email' of github.com:ese-unibe-ch/ese2012-team6 into development

Conflicts:
	trade/app/controllers/authentication_ctrl.rb
	trade/app/controllers/main_ctrl.rb

	modified:   trade/app/app.rb
	modified:   trade/app/models/helpers/security/mail_dispatcher.rb
	modified:   trade/app/models/store/trader.rb
Trader.bid refactored to adhere to ruby style guide. Please use suffix conditionals instead of prefix conditionals

	modified:   trade/app/models/store/trader.rb
	modified:   trade/test/activity_logger_test.rb
	modified:   trade/test/bidding_test.rb
Improved item popup again and fixed maildispatcher bug where mail should be sent to organization members

	modified:   trade/app/models/helpers/security/mail_dispatcher.rb
	modified:   trade/app/views/auction_store.haml
	modified:   trade/app/views/item_store.haml
	modified:   trade/app/views/partials/item_popup.haml
	modified:   trade/app/views/search_items.haml
some view changes