Added more tests for activity logger and activities

	modified:   trade/app/models/analytics/activity.rb
	modified:   trade/app/models/storage/database.rb
	modified:   trade/test/activity_logger_test.rb
	modified:   trade/test/activity_test.rb
	modified:   trade/test/item_test.rb
	new file:   trade/test/picture_uploader_test.rb
Fixed layout mistakes

	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/store.haml
Changed a few haml views, added escaped text for safe script display

	modified:   trade/app/models/store/item.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/all_items.haml
	modified:   trade/app/views/all_users.haml
	modified:   trade/app/views/error.haml
	modified:   trade/app/views/item.haml
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/profile.haml
	modified:   trade/app/views/store.haml
	modified:   trade/test/activity_logger_test.rb
Fixed a bug where marked down item description would be nil

	modified:   trade/app/controllers/item.rb
Made activity logger test more meaningful

	modified:   trade/app/models/store/user.rb
	modified:   trade/test/activity_logger_test.rb
	modified:   trade/test/database_test.rb
Layout rework, included banner. Image size checks for all picture uploading, general clean up

Activity logger now tracks failed buy attempts

	modified:   .gitignore
	modified:   trade/app/controllers/authentication.rb
	modified:   trade/app/controllers/item.rb
	modified:   trade/app/controllers/user.rb
	modified:   trade/app/models/analytics/activity.rb
	modified:   trade/app/models/analytics/activity_logger.rb
	modified:   trade/app/models/store/user.rb
	new file:   trade/app/public/images/banner_trading.png
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/all_activities.haml
	modified:   trade/app/views/all_items.haml
	modified:   trade/app/views/all_users.haml
	modified:   trade/app/views/edit_item.haml
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/partials/item_edit_form.haml
	modified:   trade/app/views/store.haml
	modified:   trade/test/activity_logger_test.rb
	modified:   trade/test/activity_test.rb
added error message to user.picture & item.picture when file size > 400kB
Refactored item delete

	modified:   trade/app/controllers/item.rb
	modified:   trade/app/models/store/user.rb
Merge branch 'jvfwb' into merger
Finished merge and fixed bug where if item image upload failed a item object would be created anyways

Conflicts:
	trade/app/controllers/user.rb
	trade/app/views/edit_item.haml

	modified:   trade/app/controllers/item.rb
	modified:   trade/app/controllers/main.rb
	modified:   trade/app/controllers/register.rb
	modified:   trade/app/controllers/user.rb
Fixed problems with StringChecker, made tests work again

	modified:   trade/app/controllers/authentication.rb
	modified:   trade/app/controllers/item.rb
	modified:   trade/app/controllers/register.rb
	modified:   trade/app/controllers/user.rb
	renamed:    trade/app/models/security/string_manager.rb -> trade/app/models/security/string_checker.rb
	modified:   trade/test/password_handler_test.rb
Added tracking of user login and logout

	modified:   .idea/ese2011-web-ui.iml
	modified:   trade/app/controllers/authentication.rb
	modified:   trade/app/models/analytics/activity.rb
	modified:   trade/app/views/all_activities.haml
	modified:   trade/test/activity_test.rb
Merged Jonas' changes to script prevention and now using a much faster webserver using the thin gem

Conflicts:
	trade/app/controllers/authentication.rb
	trade/app/controllers/item.rb
	trade/app/controllers/register.rb

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   trade/app/app.rb
	modified:   trade/app/controllers/item.rb
	modified:   trade/app/controllers/main.rb
	modified:   trade/app/models/analytics/activity.rb
	modified:   trade/app/models/store/item.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/public/styles/styles.less
	modified:   trade/app/views/edit_description.haml
	modified:   trade/app/views/register.haml
	new file:   trade/config.ru
	modified:   trade/test/item_test.rb
	modified:   trade/test/user_test.rb
Adapted regex for script injections and started experimental organization model