slider
slider
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/directives/sv-add-post-modal.js