NOJIRA restore default theme
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/default/views/Browse/ca_objects_facet_html.php