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
Issue #39, Modify ideas_controller

to get username
added hints and guides to the submission form
Issue #39, Add username in show view
Merge branch 'master' into C3_Marwa_39_SubmitEditIdea

Conflicts:
	Idearator/app/models/idea.rb
Issue #86, Add content_for to top 10
Issue #86, Add sidebar to layout
Issue #80, add vote_count table to track daily changes in votes.

This table is needed to create the Threshold method. "prev_day_votes" variable will store the
number of votes the idea got the day before, and "curr_day_votes" will store the votes that
the idea will get in the new day. Each time the Threshold method is called, the "curr_day_votes"
column values will be set to 0, and the previous values will overwrite the column "prev_day_votes".