Small changes (string checker, ? for pictures)
Merge branch 'development' of github.com:ese-unibe-ch/ese2012-team6 into nachtigall

Conflicts:
	.idea/ese2011-web-ui.iml
Merge branch 'development' of github.com:ese-unibe-ch/ese2012-team6 into nachtigall
solved problem with the reference of a comment
Merge remote-tracking branch 'origin/development' into om
Commit before merge
Merge branch 'development' of github.com:ese-unibe-ch/ese2012-team6 into nachtigall
Implemented:
Register with e-mail
Login form with button "I forgot my password" (but it leads to the store)
Error message, if no email is entered
First steps to users with id. UNSTABLE! DO NOT MERGE!

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   trade/app/controllers/activity_logger_ctrl.rb
	modified:   trade/app/controllers/authentication_ctrl.rb
	modified:   trade/app/controllers/item_ctrl.rb
	modified:   trade/app/controllers/main_ctrl.rb
	modified:   trade/app/controllers/organization_ctrl.rb
	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/store/organization.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/user.rb
Users can now be fetched by either id or name

	modified:   trade/app/models/store/organization.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/user.rb
IDs now working, have to adapt URLs though. UNSTABLE! DO NOT MERGE!

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   trade/app/app.rb
	modified:   trade/app/controllers/activity_logger_ctrl.rb
	modified:   trade/app/controllers/authentication_ctrl.rb
	modified:   trade/app/controllers/item_ctrl.rb
	modified:   trade/app/controllers/main_ctrl.rb
	modified:   trade/app/controllers/organization_ctrl.rb
	modified:   trade/app/controllers/register_ctrl.rb
	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/store/organization.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/store.haml
Added Rack Flash gem for displaying errors to gemfile, not implemented yet

	modified:   Gemfile
	modified:   Gemfile.lock
Finally a version that is not full of errors. Still: UNSTABLE! DO NOT MERGE

	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/store/item.rb
	modified:   trade/app/models/store/organization.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/views/layout.haml
	modified:   trade/test/activity_logger_test.rb
	modified:   trade/test/item_test.rb
	modified:   trade/test/user_test.rb
implemented a sell-bonus for each sold item.
not succeeded pic_upl_test
implemented a sell-bonus for each sold item.
Bonus >= 1 added as integer.
Some changes for Password reset
Merge branch 'development' into create_org
actual status
Reduction of user's credits now working

	modified:   trade/app/app.rb
	modified:   trade/app/controllers/authentication_ctrl.rb
	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/organization_profile.haml