Convert Vocables view erb to slim
Merge remote-tracking branch 'origin/template1' into templateMaster

Conflicts:
	Gemfile
	Gemfile.lock