Convert erb to slim template
Update gemfile based on CR
Merge branch 'slim'

* slim:
  Update gemfile based on CR
  Convert erb to slim template

Conflicts:
	Gemfile.lock