Merge branch 'attributed-protocols'
Merge
Fix location_attribute_authorization view
Merge branch 'master' of
https://github.com/ChiralBehaviors/Ultrastructure

Conflicts:
	animations/src/test/java/com/chiralbehaviors/CoRE/meta/models/JobModelTest.java