Changes field
Added link
Merge branch 'master' of github.com:collectiveaccess/providence

Conflicts:
	app/widgets/links/views/main_html.php
Merge branch 'master' of github.com:collectiveaccess/providence
map fix
Merge branch 'master' of github.com:collectiveaccess/providence