Edit Works
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/styles/main.styl
	app/views/directives/sv-article.html
Edit Works
Merge remote-tracking branch 'origin/master'