imported some smileys for the comments.
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.
added smileys in .gitignore
added smileys in .gitignore
Moved smileys into folder

	modified:   trade/app/models/store/comment.rb
	renamed:    trade/app/public/images/cool.gif -> trade/app/public/images/smileys/cool.gif
	renamed:    trade/app/public/images/crazy.gif -> trade/app/public/images/smileys/crazy.gif
	renamed:    trade/app/public/images/disappointed.gif -> trade/app/public/images/smileys/disappointed.gif
	renamed:    trade/app/public/images/double_minded.gif -> trade/app/public/images/smileys/double_minded.gif
	renamed:    trade/app/public/images/laugh.gif -> trade/app/public/images/smileys/laugh.gif
	renamed:    trade/app/public/images/sad.gif -> trade/app/public/images/smileys/sad.gif
	renamed:    trade/app/public/images/shocked.gif -> trade/app/public/images/smileys/shocked.gif
	renamed:    trade/app/public/images/smile.gif -> trade/app/public/images/smileys/smile.gif
	renamed:    trade/app/public/images/yeah.gif -> trade/app/public/images/smileys/yeah.gif
added pictures of comment owners
Started to refactor get buttons into links. Still work in progress. DO NOT MERGE!

	new file:   trade/app/public/scripts/form_validation.js
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/edit_profile.haml
	modified:   trade/app/views/error.haml
	modified:   trade/app/views/item.haml
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/login.haml
	modified:   trade/app/views/partials/item_edit_form.haml
	modified:   trade/app/views/profile.haml
	modified:   trade/app/views/register.haml