Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
gem file
buttons
buttons-show.
last version...
last version
Merge branch 'development' of https://github.com/tktl-app-ideas/appideas into development
Merge branch 'development' of https://github.com/akesulah/appideas into development
Merge branch 'vote' into development

Conflicts:
	db/schema.rb
Add possibility to add comments
schema
Add possibility to add comments to database
Merge branch 'add_comment' of https://github.com/hwikgren/appideas into development

Conflicts:
	Gemfile
	Gemfile.lock
fixed
Take 'Keywords' away from navbar & create admin/keywords route
Integrated Vote and Comment to Idea with Gem

Added acts_as_commentable_with_threading and acts_as_votable gems. Belongs to #72 #63 #65
Merge pull request #1 from satukark/admin2

Take 'Keywords' away from navbar & create admin/keywords route