picture upload user
changed the 's endings
ending changes
Merge branch 'MH' into ugwb

Conflicts:
	trade/app/models/store/user.rb

	modified:   trade/app/controllers/user.rb
	modified:   trade/app/models/store/user.rb
	new file:   trade/app/public/images/ese_lion.jpg
	modified:   trade/app/public/styles.css
	modified:   trade/app/views/edit_profile.haml
	modified:   trade/app/views/profile.haml
Fixed item picture upload bug and created new API to activity logger for getting most recent item description edit from database

Made git ignore picture files
	modified:   .gitignore
	modified:   trade/app/controllers/item.rb
	modified:   trade/app/models/analytics/activity_logger.rb
	modified:   trade/app/models/storage/database.rb
	deleted:    trade/app/public/images/6_homer-sleep.jpg
	deleted:    trade/app/public/images/ese_lion.jpg
added undo save description
Added Picture Uploader object for easy picture uploading

	modified:   trade/app/app.rb
	modified:   trade/app/controllers/item.rb
	modified:   trade/app/controllers/user.rb
	new file:   trade/app/models/storage/picture_uploader.rb
	modified:   trade/app/models/store/item.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/views/edit_item.haml
	modified:   trade/app/views/item.haml
	modified:   trade/app/views/profile.haml
Added most recent purchases to store view, added support for markdown description for users

	modified:   trade/app/controllers/item.rb
	modified:   trade/app/controllers/main.rb
	modified:   trade/app/controllers/user.rb
	modified:   trade/app/models/analytics/activity_logger.rb
	modified:   trade/app/views/profile.haml
	modified:   trade/app/views/store.haml
ready to merge for today
Merge branch 'om' into merger

Conflicts:
	trade/app/controllers/item.rb

	modified:   .idea/ese2011-web-ui.iml
Merge branch 'mh' into merger

Conflicts:
	.gitignore
	trade/app/controllers/item.rb
	trade/app/models/analytics/activity_logger.rb
	trade/app/views/profile.haml

	modified:   trade/app/controllers/item.rb
	modified:   trade/app/models/store/user.rb
	modified:   trade/app/public/styles.css
	new file:   trade/app/views/edit_description.haml
	modified:   trade/app/views/edit_item.haml
	modified:   trade/app/views/edit_profile.haml
	modified:   trade/app/views/new_item.haml
	modified:   trade/app/views/partials/item_edit_form.haml
Finished first rough merge of all three branches ugwb, om, mh

	modified:   trade/app/public/styles.css
	modified:   trade/app/views/edit_description.haml
Overhauled CSS and layout, now using LESS gem, added page background

	modified:   .idea/ese2011-web-ui.iml
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   trade/app/controllers/item.rb
	modified:   trade/app/controllers/main.rb
	modified:   trade/app/models/analytics/activity.rb
	modified:   trade/app/models/analytics/activity_logger.rb
	modified:   trade/app/models/storage/picture_uploader.rb
	modified:   trade/app/models/store/item.rb
	new file:   trade/app/public/scripts/less-1.3.0.min.js
	deleted:    trade/app/public/styles.css
	new file:   trade/app/public/styles/styles.less
	modified:   trade/app/views/all_items.haml
	deleted:    trade/app/views/edit_description.haml
	modified:   trade/app/views/edit_item.haml
	modified:   trade/app/views/edit_profile.haml
	modified:   trade/app/views/error.haml
	modified:   trade/app/views/layout.haml
	modified:   trade/app/views/profile.haml
Prevented page background image from being ignored by git

	modified:   .gitignore
	new file:   trade/app/public/images/page/bg_site.jpg
Readded Mansour's version of getting previous item description as I am not sure how our client wanted this feature to be implemented

Error messages are red again, had to fix error in css

	modified:   trade/app/controllers/item.rb
	modified:   trade/app/public/styles/styles.less
	new file:   trade/app/views/edit_description.haml
	modified:   trade/app/views/edit_item.haml
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
new class Sting_Manager
Merge branch 'merger' of https://github.com/ese-unibe-ch/ese2012-team6 into jvfwb
Replaced Password Handler with String_Manager. Contains 2 new methods, destroy_script and remove_leading_whitespace