Issue #167, Base for landing page
Merge branch 'master' into C1_Sameh_Landing_page

Conflicts:
	Idearator/app/views/home/index.html.erb
Merge branch 'master' into C1_Sameh_Landing_page

Add Basis for landing Page
Conflicts:
	Idearator/app/assets/stylesheets/homes.css.scss
Add Facebook and twitter login to Landing page
Issue #167, Add Landing Page view
Merge branch 'master' into C1_Sameh_Landing_page

Conflicts:
	Idearator/app/assets/javascripts/home.js
Merge branch 'C4_Salah_217_stream_interaction' into C1_Sameh_Landing_page

Conflicts:
	Idearator/app/assets/javascripts/home.js
	Idearator/app/views/layouts/application.html.erb
	Idearator/config/routes.rb
Issue #217 corrects search floq
Issue #217, includes the global infinite_scrolling function along with the tag filtering from outside the stream
Issue #167, Fix Landing Page css
Merge branch 'master' into C1_Sameh_Landing_page

Conflicts:
	Idearator/Gemfile.lock
	Idearator/app/assets/javascripts/application.js
	Idearator/app/assets/stylesheets/home.css.scss
	Idearator/config/routes.rb
Merge branch 'C1_Sameh_#78_action_share_facebook' into C1_Sameh_Landing_page

Conflicts:
	Idearator/Gemfile.lock
	Idearator/app/assets/javascripts/home.js
Revert "Merge branch 'C4_Salah_217_stream_interaction' into C1_Sameh_Landing_page"

This reverts commit f2c3fad70eff6020f83dc77c4bfbaed876470825, reversing
changes made to 40000460b7a46b9665caa9e009d07b798c00a411.

Conflicts:

	Idearator/Gemfile.lock
	Idearator/app/assets/javascripts/application.js
	Idearator/app/views/home/landing.html.erb
	Idearator/config/routes.rb
Issue #217 fixes the scenario and code
Issue #167, Add javascript scrolling to show and hide sign in
Merge branch 'C1_AminaZoheir_#219_Unauthorized' into C1_Sameh_Landing_page

Conflicts:
	Idearator/app/assets/javascripts/application.js
	Idearator/app/assets/javascripts/home.js
	Idearator/app/views/home/index.html.erb
	Idearator/app/views/layouts/application.html.erb
Issue #217 includes top ten
Issue #167, Fix Sign in
Issue #167, Fix CSS
Merge branch 'master' of https://github.com/DevYah/coolsoft-13 into C1_Sameh_Landing_page

Conflicts:
	Idearator/app/assets/stylesheets/home.css.scss
	Idearator/app/models/idea.rb
	Idearator/app/views/home/index.html.erb