Fix conflicts with master
Fix conflicts
Merge branch 'C1_mennaamr_#91_Facebook_login' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#91_Facebook_login
Fix application.js
Merge branch with Twitter Login
Manage not allowing banned users to sign in
Log out user if they were banned
Change deactivation to Modal Dialogue
Merge master into Facebook login
Added hints to idea submission form
Add js and css files
Update form hints
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