Changed view settings, added new css styles
Merge remote-tracking branch 'origin/254' into test

Conflicts:
	sites/all/themes/idevels/styles/styles.css