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
added a short sentence for mac users in readme.md
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
Merge branch 'mh' of github.com:ese-unibe-ch/ese2012-team6 into development
Prevented test picture (for pic upload test) from being ignored

	modified:   .gitignore
	modified:   trade/app/models/storage/picture_uploader.rb
	new file:   trade/test/pictures/test_picture.jpg
Fixed a few test issues and added more documentation

	modified:   trade/app/controllers/activity_logger_ctrl.rb
	modified:   trade/app/models/security/mail_client.rb
	modified:   trade/app/models/security/password_generator.rb
	modified:   trade/app/models/security/string_checker.rb
	modified:   trade/app/models/storage/picture_uploader.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/organization_test.rb
	modified:   trade/test/trading_authority_test.rb
	modified:   trade/test/user_test.rb
Added pictures to user, org and item tables, status bar now also shows credits of org

	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/layout.haml
	modified:   trade/app/views/store.haml
Reformatted code according to ruby style guide

	modified:   trade/app/models/analytics/activity.rb
	modified:   trade/app/models/analytics/activity_logger.rb
	modified:   trade/app/models/security/mail_client.rb
	modified:   trade/app/models/security/string_checker.rb
	modified:   trade/app/models/storage/picture_uploader.rb
	modified:   trade/app/models/store/comment.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/trading_authority.rb
	modified:   trade/app/models/store/user.rb
User member of list now links you to organization

	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/trading_authority.rb
	modified:   trade/app/views/edit_organization.haml
	modified:   trade/app/views/error.haml
	modified:   trade/app/views/user_profile.haml
Fixed a few issues

	modified:   trade/app/controllers/main_ctrl.rb
	modified:   trade/app/controllers/organization_ctrl.rb
	modified:   trade/app/models/store/trading_authority.rb
	modified:   trade/app/public/scripts/form_validation.js
added a 'sleep(0.001)' in the system_user_test.