create_org not final version
added smileys in the comment textbox area
Merge branch 'om' into development
array for members
Multiple user select now works

	modified:   trade/app/controllers/organization_ctrl.rb
	modified:   trade/app/views/new_organization.haml
improved smiley view of the comment areas
Organization creation is now a PUT handler

	modified:   trade/app/controllers/organization_ctrl.rb
	modified:   trade/app/views/new_organization.haml
finished comments with smileys
finished comments with smileys.
Merge remote-tracking branch 'origin/om' into development
Merge branch 'development' of https://github.com/ese-unibe-ch/ese2012-team6 into add_remove_users_to_organization
merging :)
Merge branch 'development' of https://github.com/ese-unibe-ch/ese2012-team6 into development
Merge branch 'create_org' of github.com:ese-unibe-ch/ese2012-team6 into development
Merge branch 'add_remove_users_to_organization' of github.com:ese-unibe-ch/ese2012-team6 into development
First steps at buying items on behalf of an organization. UNSTABLE! DO NOT MERGE!

	modified:   trade/app/app.rb
	modified:   trade/app/controllers/item_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/views/item.haml
	modified:   trade/app/views/store.haml
Merge branch 'development' of https://github.com/ese-unibe-ch/ese2012-team6 into add_remove_users_to_organization
Improved buy on behalf of and improved a few other things too

	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/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/public/scripts/form_validation.js
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/thin.pid
	modified:   trade/app/views/item.haml
	modified:   trade/app/views/new_organization.haml
	modified:   trade/app/views/organization.haml
	modified:   trade/test/item_test.rb
Merge branch 'buy_on_behalf_of' into development

Conflicts:
	trade/app/controllers/organization_ctrl.rb
	trade/app/public/styles/styles.less
	trade/app/views/organization.haml

	modified:   trade/app/app.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/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/public/scripts/form_validation.js
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/all_organizations.haml
	modified:   trade/app/views/item.haml
	modified:   trade/app/views/organization.haml
	modified:   trade/app/views/store.haml
	modified:   trade/test/item_test.rb
Added owner selector while creating item and profile link in nav bar is now on_behalf_of sensitive

	modified:   trade/app/controllers/item_ctrl.rb
	modified:   trade/app/controllers/user_ctrl.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/partials/item_edit_form.haml
Item quick add now has dedicated PUT handler

	modified:   trade/app/controllers/item_ctrl.rb
	modified:   trade/app/views/organization.haml
	modified:   trade/app/views/profile.haml