Quickly v2
Quickly v2
Quickly v2
Merge branch 'feature/quickly-v2' of github.com:davidjgonzalez/acs-aem-commons into quickly-v2

Conflicts:
	bundle/src/main/java/com/adobe/acs/commons/quickly/operations/impl/HelpOperationImpl.java
	bundle/src/main/java/com/adobe/acs/commons/quickly/results/Result.java
	bundle/src/main/java/com/adobe/acs/commons/quickly/results/impl/lists/TouchConsoleResults.java
	bundle/src/main/java/com/adobe/acs/commons/quickly/results/impl/serializers/AbstractResultSerializer.java
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/clientlibs/js/controller.js
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/clientlibs/js/directives.js
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/clientlibs/js/services/action.js
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/quickly.html
Merge branch 'feature/quickly-v2' of github.com:davidjgonzalez/acs-aem-commons into quickly-v2

Conflicts:
	bundle/src/main/java/com/adobe/acs/commons/quickly/operations/impl/HelpOperationImpl.java
	bundle/src/main/java/com/adobe/acs/commons/quickly/results/Result.java
	bundle/src/main/java/com/adobe/acs/commons/quickly/results/impl/lists/TouchConsoleResults.java
	bundle/src/main/java/com/adobe/acs/commons/quickly/results/impl/serializers/AbstractResultSerializer.java
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/clientlibs/js/controller.js
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/clientlibs/js/directives.js
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/clientlibs/js/services/action.js
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/quickly.html
Merge branch 'feature/quickly-v2' of github.com:davidjgonzalez/acs-aem-commons into quickly-v2

Conflicts:
	content/src/main/content/jcr_root/apps/acs-commons/components/utilities/quickly/clientlibs/js/controller.js
Quickly v2
Quickly v2
Quickly v2 - User-specific local storage
Quickly v2
Quickly v2 - Bizarre git/IDE issues w renaming
Quickly v2 - Directives refactor
Quickly v2 - Directives refactor
Quickly v2
Quickly v2
Quickly v2 - Set @ProviderType
Quickly v2
Merge branch 'feature/angular-reorg' into feature/quickly-v2

Conflicts:
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/.content.xml
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/.content.xml
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/angular-animate.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/angular-cookies.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/angular-resource.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/angular-route.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/angular-sanitize.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/angular-touch.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/angular.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/core/.content.xml
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.2/js.txt
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-animate.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-animate.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-animate.min.js.map
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-cookies.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-cookies.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-resource.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-resource.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-route.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-route.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-route.min.js.map
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-sanitize.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-sanitize.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-touch.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-touch.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular-touch.min.js.map
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular.min.js
	content/src/main/content/jcr_root/etc/clientlibs/acs-commons/vendor/angularjs/v1.3/angular.min.js.map
Quickly vs - AngularJS re-org support
Merge branch 'feature/angular-reorg' into feature/quickly-v2