Merge pull request #376 from wardi/master

update transitional_orgs, disable fields in org edit form
License changes for OCL
Remove pipe in new license name
Update NAVL to better support multiple licenses
Merge pull request #377 from thriuin/master

Added a license for the OCL
Merge pull request #378 from wardi/master

updates for ATI and recombinant changes
select first license by default