added new model 'comment', which can store a description and the owner of this description.
added item_comments. On the item page, an authenticated user is able to comment all items, which are stored.
added item_comments. On the item page, an authenticated user is able to comment all items, which are stored.
improved comments
Merge remote-tracking branch 'origin/merger' into om

Conflicts:
	.idea/ese2011-web-ui.iml
	trade/app/models/store/item.rb

added a delete button for all comments, which belong to the actual user.
Merge branch 'om' of github.com:ese-unibe-ch/ese2012-team6 into merger

Conflicts:
	.idea/ese2011-web-ui.iml
	trade/app/app.rb
	trade/app/controllers/register.rb
	trade/app/models/store/user.rb

	modified:   .gitignore
	modified:   .idea/dictionaries/gerberur.xml
	modified:   trade/app/app.rb
	modified:   trade/app/controllers/activity_logger.rb
	modified:   trade/app/controllers/authentication.rb
	modified:   trade/app/controllers/item.rb
	modified:   trade/app/controllers/organization.rb
	modified:   trade/app/controllers/register.rb
	modified:   trade/app/controllers/user.rb
	modified:   trade/app/models/analytics/activity.rb
	modified:   trade/app/models/analytics/activity_logger.rb
	new file:   trade/app/models/store/comment.rb
	modified:   trade/app/models/store/item.rb
	modified:   trade/app/models/store/system_user.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/all_users.haml
	modified:   trade/app/views/item.haml
	modified:   trade/test/activity_logger_test.rb
	modified:   trade/test/item_test.rb
	modified:   trade/test/user_test.rb
imported some smileys for the comments.
Made organization tests work, moved banner into correct folder

	modified:   trade/app/models/store/organization.rb
	renamed:    trade/app/public/images/banner_trading.png -> trade/app/public/images/page/banner_trading.png
	modified:   trade/app/views/layout.haml
	modified:   trade/test/organization_test.rb
Renamed controller files (only files, not class names)

	modified:   trade/app/app.rb
	renamed:    trade/app/controllers/activity_logger.rb -> trade/app/controllers/activity_logger_ctrl.rb
	renamed:    trade/app/controllers/authentication.rb -> trade/app/controllers/authentication_ctrl.rb
	renamed:    trade/app/controllers/item.rb -> trade/app/controllers/item_ctrl.rb
	renamed:    trade/app/controllers/main.rb -> trade/app/controllers/main_ctrl.rb
	renamed:    trade/app/controllers/organization.rb -> trade/app/controllers/organization_ctrl.rb
	renamed:    trade/app/controllers/register.rb -> trade/app/controllers/register_ctrl.rb
	renamed:    trade/app/controllers/user.rb -> trade/app/controllers/user_ctrl.rb
Removed the need to have two separate views for item edit with item description or previously stored description

	modified:   trade/app/controllers/item_ctrl.rb
	modified:   trade/app/public/styles/styles.less
	renamed:    trade/app/views/edit_description.haml -> trade/app/views/edit_item.haml
solved problem: user able to use smileys
solved problem: user able to use smileys
probelm solved: smileys available.
problem solved
Updated gitignore

	modified:   .gitignore
Removed old .idea files

	deleted:    .idea/.name
	deleted:    .idea/dictionaries/gerberur.xml
	deleted:    .idea/encodings.xml
	deleted:    .idea/ese2011-web-ui.iml
	deleted:    .idea/modules.xml
	deleted:    .idea/scopes/scope_settings.xml
	deleted:    .idea/vcs.xml
Fixed bug where organization page would be accessible without login

	modified:   trade/app/controllers/organization_ctrl.rb
solved problem: user able to use smileys
Merge remote-tracking branch 'origin/development' into om

Conflicts:
	.idea/.name
	.idea/encodings.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vcs.xml
deleted idea.