Issue#39 fixed rest of conflicts
Merge branch 'master' into C3_Marwa_39_SubmitEditIdea

Conflicts:
	Idearator/Gemfile.lock
	Idearator/app/controllers/ideas_controller.rb
	Idearator/app/views/ideas/_form.html.erb
	Idearator/app/views/ideas/show.html.erb
	Idearator/config/routes.rb
Merge branch 'master' into C3_Marwa_39_SubmitEditIdea
Issue #39, Add ideas controller
Issue #39, Add idea model
Issue #39, Add ideas_tags model
Issue #39, Add form in views/ideas
Issue #39, Add edit view
Issue #39, Add new view
Issue #39, Add show view
Issue #39, Add development file

this file is changed to make paperclip work.
Issue #39, Add routes
Issue #39, Modify idea model
Add Account Settings button and modal
Merge branch 'C1_Sameh_#79_account_settings_migrations' into C1_Sameh_#79_account_settings
Issue #79, Save progress
Merge branch 'C1_Sameh_#79_account_settings_migrations' into C1_Sameh_#79_account_settings
Merge branch 'C3_Marwa_39_SubmitEditIdea' into C1_Sameh_#79_account_settings

Conflicts:
	Idearator/config/routes.rb
Add Account Settings In Navigation Bar
Merge branch 'master' into C1_Sameh_#79_account_settings
Issue #79, Fix Redirecting after filling form