vcc
Merge branch 'master' of https://github.com/paulgroves/iserfrontend-rails

Conflicts:
	app/assets/stylesheets/patterns.css.sass