Added doc to Activities

	modified:   trade/app/models/analytics/activity.rb
	modified:   trade/app/models/analytics/activity_logger.rb
Merge branch 'activity_doc' into development
Every request handler in every controller is now documented. Moved logic about user not knowing latest item changes to model instead of controller, and included tests

	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/system_user.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/views/login.haml
	modified:   trade/test/system_user_test.rb
added some unit tests for the comment model
Refactored SystemUser, User, Org a little bit fixed remaining failing tests

	modified:   trade/app/controllers/item_ctrl.rb
	modified:   trade/app/controllers/main_ctrl.rb
	modified:   trade/app/models/analytics/activity_logger.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/partials/item_edit_form.haml
	modified:   trade/app/views/user_profile.haml
	modified:   trade/test/activity_logger_test.rb
	modified:   trade/test/system_user_test.rb
	modified:   trade/test/user_test.rb
Added Mail Client and something like a test for that
Created TradingAuthority object which reduces User's credits after a predefined interval

Included tests for it too

	modified:   trade/app/app.rb
	modified:   trade/app/models/store/system_user.rb
	new file:   trade/app/models/store/trading_authority.rb
	modified:   trade/test/system_user_test.rb
	new file:   trade/test/trading_authority_test.rb
Merge branch 'password_reset' of github.com:ese-unibe-ch/ese2012-team6 into development
Still a problem in authentication_ctrl.rb params[:username] doesn't work, always nil
Merge branch 'password_reset' of github.com:ese-unibe-ch/ese2012-team6 into development

Conflicts:
	Gemfile
	trade/app/models/security/string_checker.rb
	trade/app/models/store/user.rb
	trade/app/views/login.haml

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   trade/app/controllers/authentication_ctrl.rb
	modified:   trade/app/models/security/Mail_Client.rb
	modified:   trade/app/models/security/password_generator.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/views/login.haml
	modified:   trade/test/mail_client_test.rb
	modified:   trade/test/string_checker_test.rb
Little coding style adjustments

	modified:   trade/app/controllers/authentication_ctrl.rb
	modified:   trade/test/mail_client_test.rb
Fixed merge artifacts

	modified:   trade/app/models/store/user.rb
Fixed bug with org picture upload

	modified:   trade/app/controllers/organization_ctrl.rb
PW reset working
Merge branch 'password_reset' of github.com:ese-unibe-ch/ese2012-team6 into development

Conflicts:
	trade/app/controllers/authentication_ctrl.rb

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   trade/app/controllers/authentication_ctrl.rb
	renamed:    trade/app/models/security/Mail_Client.rb -> trade/app/models/security/mail_client.rb
	modified:   trade/app/models/security/password_generator.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/views/login.haml
	modified:   trade/test/mail_client_test.rb
comments also deleted in the class Array variable.
Added more tests to models and refactored a few class methods

	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/register_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/test/item_test.rb
	modified:   trade/test/organization_test.rb
	modified:   trade/test/picture_uploader_test.rb
	modified:   trade/test/system_user_test.rb
	modified:   trade/test/user_test.rb
Merge branch 'om' of github.com:ese-unibe-ch/ese2012-team6 into development
Finished merge, added few more tests

	modified:   trade/app/app.rb
	modified:   trade/app/controllers/item_ctrl.rb
	modified:   trade/app/models/store/comment.rb
	modified:   trade/app/models/store/item.rb
	modified:   trade/app/views/all_activities.haml
	modified:   trade/test/comment_test.rb
	modified:   trade/test/item_test.rb
Improved picture uploading and included test for picture uploader

	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/organization_ctrl.rb
	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/storage/picture_uploader.rb
	modified:   trade/app/models/store/item.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/test/picture_uploader_test.rb