new app.conf options
Merge branch 'master' of github.com:collectiveaccess/providence

Conflicts:
	themes/default/views/find/Browse/ajax_browse_facet_html.php