Mattress mods from Julia
Mod of helptext language from Julia
Merge branch 'master' of http://github.com/collectiveaccess/providence
Updates to BAM profile
Added options for matching on labels and displaynames (for entities)
Merge branch 'master' of github.com:collectiveaccess/providence

Conflicts:
	app/lib/ca/Utils/DataMigrationUtils.php
getOccurrenceIDsByName() now takes optional type param
Updated BAM installation profile
Merge branch 'master' of http://github.com/collectiveaccess/providence
Fixed French localization typo in SPECTRUM profile
Merge branch 'master' of github.com:collectiveaccess/providence
Fixed broken "requires" option support
Merge branch 'master' of http://github.com/collectiveaccess/providence
Media queue was not properly handling default icons
No relative paths in unit tests
Fix access control tests
Moved AccessControlTest to proper location and added some code that tests sanity of the base class for the new JSON services.
Added test for caFormatJson utility because we use it quite frequently in JSON-based service API
New tests for GET part of ItemService
Oops