Posts and Comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/directives/sv-article.html
	app/views/directives/sv-article.jade
Posts and Comments
Merge remote-tracking branch 'origin/master'