Adapted artifact version
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev-customer-enhancements
Added small note on how to develop repository browser stuff inside of aloha editor
Updated the repository browser to support filling the tree with folder structures (when folder objects contain children)
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev-customer-enhancements

Conflicts:
	pom.xml
Fixed repository-manager not initializing repositories when they are late-loaded (IE 7 does this)
Story 3992 Task 4446: Persist current state of tree
Story 2379 Task 4459: Added test for initializing a repository late
Updated repository browser (implemented adaptive pagesize, modify height when window is resized, fixed some paging errors)
Merge branch 'dev-customer-enhancements' of github.com:alohaeditor/Aloha-Editor into dev-customer-enhancements

Conflicts:
	src/lib/vendor/repository-browser/js/repository-browser-unminified.js
	src/lib/vendor/repository-browser/js/repository-browser.js
Added configuration options for adaptive page size to guides
Updated repository browser to a version that has the positioning fixed
Updated the repository browser with a fix for clearing the search when clicking in the tree
Implemented restoring of last selected folder in repository browser
Fixed setting the node state for folders with 'hasMoreItems' set to 'false'
Removed old hotfix changelog file
Merge branch 'dev-codestyle' into hotfix

Conflicts:
	pom.xml
Merge branch 'dev-codestyle' into release

Conflicts:
	pom.xml
Fixes styling for aloha-links blocks to not have the "golden halos"
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into release

Conflicts:
	pom.xml