Made the news feed look more intuitivw
Added "attach doc" and "attach image" to the comments
Added "add a link" feature to comments
Added the functionality to "attach_emoticons" in comments
Merge branch 'master' of github.com:The-WebOps-Club/fest-api

Conflicts:
	files/templates/base/base.html