the <%- syntax is outdated
Merge branch 'master' of github.com:CruGlobal/sp

Conflicts:
	app/views/admin/people/_form.html.erb