General information section edit and display states
General information section edit and display states
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/directives/sv-listing-display-slider.js
	app/scripts/directives/sv-listing-sale.js
	app/views/directives/sv-listing-sale.html