Update to ruby 2.1.4
Dont show address if publish_data is false
Merge branch 'master' of github.com:Bestra/cso-chorus-page

Conflicts:
	app/views/members/_directory_entry.html.slim