Added a template helper to address '1 points'
Merge pull request #115 from jonathanmtran/master

Added a template helper to address '1 points'
fixed queued comments bug
Duplicate Template.post_submit.rendered assignment in post_submit.js
Update config.js

Add "annotation:'bubble'" to googlePlus buttons config to make it behave normally
Merge pull request #123 from chemfire/master

update google+ share button style
Merge pull request #119 from oyerli/patch-1

Duplicate Template.post_submit.rendered assignment in post_submit.js
Updated screen content
make upvote cleanup prior downvote and vice-versa
Merge pull request #127 from mrcoles/master

Make upvote cleanup prior downvote and vice-versa
Merge branch 'master' of https://github.com/SachaG/Telescope

Conflicts:
	client/views/posts/post_item.html