NOJIRA Newschool production changes
NOJIRA NewSchool changes
NOJIRA Newschool changes
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	app/helpers/themeHelpers.php
	themes/default/assets/pawtucket/css/main.css
	themes/default/views/Search/ca_collections_search_subview_html.php
	themes/default/views/Search/ca_objects_search_subview_html.php
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/default/views/Search/ca_objects_search_subview_html.php
	themes/newschool/conf/media_display.conf
	themes/newschool/views/About/Index.php
	themes/newschool/views/Details/ca_objects_default_html.php
Merge branch 'master' of github.com:collectiveaccess/pawtucket2
NOJIRA New School production change
NOJIRA allow width/height percentages in mediaelement player
Merge branch 'master' of github.com:collectiveaccess/pawtucket2

Conflicts:
	themes/newschool/views/Details/ca_objects_default_html.php