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
Profile view (user or org) now refreshes to the new on behalf of when context swicht is changed

	modified:   trade/app/controllers/user_ctrl.rb
Merge branch 'development' of github.com:ese-unibe-ch/ese2012-team6 into development
General code improvement and cleanup

	modified:   trade/app/app.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/store/organization.rb
	modified:   trade/app/models/store/user.rb
	renamed:    trade/app/views/activity.haml -> trade/app/views/activity_details.haml
	deleted:    trade/app/views/change_organization.haml
	new file:   trade/app/views/edit_organization.haml
	renamed:    trade/app/views/item.haml -> trade/app/views/item_details.haml
	modified:   trade/app/views/new_organization.haml
	renamed:    trade/app/views/organization.haml -> trade/app/views/organization_profile.haml
	renamed:    trade/app/views/profile.haml -> trade/app/views/user_profile.haml
Further improvements and fixes

	modified:   trade/app/controllers/organization_ctrl.rb
	modified:   trade/app/views/all_organizations.haml
	modified:   trade/app/views/edit_organization.haml
	modified:   trade/app/views/organization_profile.haml
	modified:   trade/app/views/user_profile.haml
Fixed user delete error

	modified:   trade/app/controllers/item_ctrl.rb
Moved managing admins to org edit page

	modified:   trade/app/controllers/organization_ctrl.rb
	modified:   trade/app/views/edit_organization.haml
	modified:   trade/app/views/organization_profile.haml
Fixed bug where comment owner link would point to wrong profile

	modified:   trade/app/views/item_details.haml
Item comment can now be deleted when the owner of the comment is the user/org the logged in user is working on behalf of

	modified:   trade/app/views/item_details.haml
Item quick add only shows when really working as viewed profile owner

	modified:   trade/app/models/store/user.rb
	modified:   trade/app/views/organization_profile.haml
	modified:   trade/app/views/user_profile.haml
solved problem with the reference of a comment
Nothing too major

	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/views/item_details.haml
Fixed bug with organization editing when no picture is being selected

	modified:   trade/app/controllers/organization_ctrl.rb
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