Issue #78, Add Javascript for sharing integration
Merge branch 'improving_idea_submission_form' into C1_Sameh_#78_action_share_facebook
Issue #78, Add Vote action javascript
Issue #78, Add working vote action
Merge branch 'master' into C1_Sameh_#78_action_share_facebook

Conflicts:
	Idearator/app/assets/stylesheets/ideas.css.scss
	Idearator/app/views/home/_stream.html.erb
	Idearator/app/views/ideas/show.html.erb
	Idearator/config/environments/development.rb
Issue #78, Fix vote action and Add create action
Merge branch 'master' into C1_Sameh_#78_action_share_facebook

Conflicts:
	Idearator/app/models/user.rb
Issue #78, Fix Error in Vote share
Merge branch 'master' into C1_Sameh_#78_action_share_facebook

Conflicts:
	Idearator/app/assets/javascripts/ideas.js
	Idearator/app/controllers/users_controller.rb
	Idearator/app/views/ideas/_share.html.erb
	Idearator/app/views/ideas/_stream_component.html.erb
Merge branch 'master' into C1_Sameh_#78_action_share_facebook
Issue #78, Merge master
Issue #78, Add UML
Issue #78, Add Doc
Issue #78, Add tests
Merge branch 'master' into C1_Sameh_#78_action_share_facebook

Conflicts:
	Idearator/Gemfile
	Idearator/Gemfile.lock
	Idearator/app/assets/javascripts/application.js
	Idearator/app/assets/javascripts/home.js
	Idearator/app/models/idea.rb
	Idearator/app/models/user.rb
	Idearator/app/views/devise/registrations/edit.html.erb
	Idearator/app/views/layouts/application.html.erb
	Idearator/app/views/users/_settings.html.erb
	Idearator/config/application.rb
Merge branch 'master' into C1_Sameh_#78_action_share_facebook

Conflicts:
	Idearator/app/controllers/registrations_controller.rb
Merge pull request #262 from DevYah/C1_Sameh_#78_action_share_facebook

C1 sameh #78 action share facebook
Issue #234 Fix twitter_action_sharing_spec wrong describe messages
Merge pull request #302 from DevYah/C3_MahmoudHashish_#234_fix_twitter_tests

Issue #234 Fix twitter_action_sharing_spec wrong describe messages
Merge master into improving_idea_submission_form