Stupid dic file

	new file:   .idea/dictionaries/gerberur.xml
Merge branch 'development'
Merge branch 'development' of github.com:ese-unibe-ch/ese2012-team6
RELEASE CANDIDATE! NOT FINAL VERSION!

	modified:   trade/app/controllers/authentication_ctrl.rb
	modified:   trade/app/models/security/mail_client.rb
	modified:   trade/app/models/security/password_generator.rb
Fixed merge error

	modified:   trade/app/controllers/authentication_ctrl.rb
Removed gem rand62. Because that's how we roll...

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   trade/app/models/security/password_generator.rb
Deleted dict file

	deleted:    .idea/dictionaries/gerberur.xml
Moved helper classes into helper folder

	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
	renamed:    trade/app/models/security/mail_client.rb -> trade/app/models/helpers/security/mail_client.rb
	renamed:    trade/app/models/security/password_generator.rb -> trade/app/models/helpers/security/password_generator.rb
	renamed:    trade/app/models/security/string_checker.rb -> trade/app/models/helpers/security/string_checker.rb
	renamed:    trade/app/models/storage/picture_uploader.rb -> trade/app/models/helpers/storage/picture_uploader.rb
	modified:   trade/app/models/store/item.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/trading_authority.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/test/comment_test.rb
	renamed:    trade/test/mail_client_test.rb -> trade/test/helper_tests/mail_client_test.rb
	renamed:    trade/test/picture_uploader_test.rb -> trade/test/helper_tests/picture_uploader_test.rb
	renamed:    trade/test/pictures/test_picture.jpg -> trade/test/helper_tests/pictures/test_picture.jpg
	renamed:    trade/test/string_checker_test.rb -> trade/test/helper_tests/string_checker_test.rb
	modified:   trade/test/item_test.rb
	modified:   trade/test/organization_test.rb
	modified:   trade/test/user_test.rb
Changed update status method of item

	modified:   trade/app/controllers/item_ctrl.rb
	modified:   trade/app/models/store/item.rb
	modified:   trade/test/item_test.rb
Removed unnecessary code in org creation view

	modified:   trade/app/controllers/organization_ctrl.rb
	modified:   trade/app/views/new_organization.haml
Small fixes

	modified:   trade/app/controllers/authentication_ctrl.rb
	modified:   trade/app/controllers/main_ctrl.rb
	modified:   trade/app/public/styles/styles.less
Doc improvement

	modified:   trade/app/models/store/item.rb
	modified:   trade/app/models/store/organization.rb
	modified:   trade/app/models/store/system_user.rb
Improved doc

	modified:   trade/app/models/store/organization.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/trading_authority.rb
	modified:   trade/app/models/store/user.rb
ActivityLoggerTest working now?

	modified:   trade/app/models/analytics/activity_logger.rb
	modified:   trade/test/trading_authority_test.rb
Commented out machine dependent tests

	modified:   trade/test/system_user_test.rb
	modified:   trade/test/trading_authority_test.rb
Merge branch 'master' into mh
final version