NOJIRA An update of the Smithsonian Channel profile
Merge branch 'master' of github.com:collectiveaccess/providence
Merge branch 'master' of github.com:collectiveaccess/providence
Merge branch 'master' of github.com:collectiveaccess/providence
PROV-876 Use POST request to reload form after type change; fix minor form styling issues
NOJIRA SNI profile changes
NOJIRA support idnos as hierarchy specifiers
NOJIRA remove js error
Merge branch 'master' into master-fix
NOJIRA get rid of iphone video derivative
Merge branch 'master-fix' into develop

Conflicts:
	app/lib/core/BaseModel.php