Merge branch 'develop' into stable

package com.inteligr8.alfresco.activiti;

/**

 * This interface appends CXF implementation specific methods to the JAX-RS API

 * of the APS Protected ReST API.  This is due to a lack of multi-part in the

 * JAX-RS specification.

 * 

 * @author brian@inteligr8.com

 */

public interface ApsProtectedRestCxfApi extends ApsProtectedRestApi, ApsPublicRestCxfApi {

}

package com.inteligr8.alfresco.activiti;

/**

 * This interface appends Jersey implementation specific methods to the JAX-RS

 * API of the APS Protected ReST API.  This is due to a lack of multi-part in

 * the JAX-RS specification.

 * 

 * @author brian@inteligr8.com

 */

public interface ApsProtectedRestJerseyApi extends ApsProtectedRestApi, ApsPublicRestJerseyApi {

}

	enum ModelType {

		Process(0),

		Form(2),

		App(3);

		App(3),

		DecisionTable(4),

		DataModel(5);

		private int id;

		private ModelType(int id) {