API refactoring.
API refactoring.
Work in progress
API refactoring.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	impl/src/main/java/org/craftercms/studio/impl/forms/FormServiceImpl.java
	impl/src/test/java/org/craftercms/studio/impl/audit/AuditManagerImplTest.java
	impl/src/test/java/org/craftercms/studio/impl/blueprints/BlueprintsManagerImplTest.java
	impl/src/test/java/org/craftercms/studio/impl/dependency/DependencyManagerImplTest.java
	impl/src/test/java/org/craftercms/studio/impl/deployment/DeploymentManagerImplTest.java
	impl/src/test/java/org/craftercms/studio/impl/forms/FormServiceImplTest.java
	impl/src/test/java/org/craftercms/studio/impl/lifecycle/LifecycleManagerImplTest.java
	impl/src/test/java/org/craftercms/studio/impl/version/VersionServiceImplTest.java
	impl/src/test/java/org/craftercms/studio/impl/workflow/WorkflowManagerImplTest.java
	server/src/main/java/org/craftercms/studio/controller/services/rest/AssetController.java
work in progress
Merge branch 'master' of github.com:craftercms/studio3
work in progress