Merge pull request #12 from shifakhan/master

Updated jquery for voting.coffee
updated popover
Merge http://github.com/gautamrege/chwink
removed spec from comment model
Merge https://github.com/shifakhan/chwink

Conflicts:
	app/models/comment.rb
Merge pull request #13 from shifakhan/master

Updated jquery for comments
Merge https://github.com/gautamrege/chwink
removing validation from comment
Merge pull request #14 from pkrawat1/master

popover overlapping problem resolved
assigned default value to cheink description and added link to new chwink if chwink is not present or category has no chwinks
alert notice center aligned
Merge pull request #15 from pkrawat1/master

updated chwinks controller for default value in description
Updated seeds.rb and chwinks controller