moved image to the right location (conflict)

Conflicts:
	app/assets/images/removex.png
fix image link (conflict)

Conflicts:
	public/conversation_pages/convo_gallery.html
860 - Fixed - Follow button not working on conversation page and organization profile page. (conflicts)

Conflicts:
	RELEASE.mdown
	app/views/subscriptions/_notsubscribed.html.erb
856 - Fixed: Avatar - "What do you Think" Non-Logged in Missing (conflict)

Conflicts:
	RELEASE.mdown
	app/views/conversations/show.html.haml
[847] Remove Filter Option on Conversations

Conflicts:
	RELEASE.mdown
[853] Remove Filter New Styles Blog / Convo Topic / Metro

Conflicts:
	RELEASE.mdown
[853] Remove Filter New Styles Blog Filter Posts by Author.
815 - Vote Results Details Extract

Conflicts:
	RELEASE.mdown
[808] Add Required Field Indicator when Starting A Conversation

Conflicts:
	RELEASE.mdown
Styling for Remove

Conflicts:
	app/assets/stylesheets/master.css.scss
Author Remove Filter
Blog styling - Remove Filter