Added 18.1 link
Merge branch 'master_18.1'

Conflicts:
	app/index.erb