pimcore-1 Adding Site Selection in Portal Analytics Portlets
Merge pull request #3 from pimcore/master

merge Master
pimcore-4 Error Message in Reporting Modul

Error was made in the settings page
Merge pull request #5 from pimcore/master

merge Master
Merge pull request #6 from pimcore/master

merge Master
pimcore-2 Portlet Analytics Modifications / Multiside
pimcore-2 Portlet Analytics Modifications / Multiside
Merge pull request #7 from pimcore/master

Develop
Merge remote-tracking branch 'origin/master'

* origin/master: (46 commits)
  PIMCORE-1726 - Nested Areablocks + made the selectors in block element more specific (added name to the class)
  PIMCORE-1668 - Add "itemprop" as allowed attribute to Document_Tag_Image
  PIMCORE-1722 - image tag thumbnail width -> do not autodetect when width is specified in configuration
  assets: fixed html5 upload on root-node
  version ...
  Cache-Manager: support for write locks
  pimcore memcache adapter: make use of the parent::save() again
  RSS Portlet: Removed default twitter feed & handle exceptions
  version ...
  moved clearDependendCache() into save method (asset,object,document) + changed update() method to protected (document)
  PIMCORE-870 - Create database transactions -> not completely finished
  PIMCORE-870 - Create database transactions -> not completely finished
  PIMCORE-590 - consider race conditions (document/asset/object) fixed problem when creating new elements
  Tool_Lock: reduced sleep to 1 sec
  Tool_Lock: added isLocked static method
  PIMCORE-590 - consider race conditions (document/asset/object)
  added locking support (general -> like semaphores)
  fixed error when opening object containing a not editable link field
  ad 1947: changed interval to timeout
  fixed bug: redirects with prio 99 didn't work
  ...

Conflicts:
	pimcore/modules/admin/controllers/PortalController.php
Merge pull request #10 from pimcore/master

merge Master
PIMCORE-1788 - Possibility to add document types via plugins

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2033 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
version ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2034 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1751 - Text issue on search dialog

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2035 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1783 - DateTime version preview does not return time

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2036 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1785 - Show data component type in class editor

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2037 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
version ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2038 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1788 - Possibility to add document types via plugins

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2039 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
output-cache: do not cache if session was used somewhere in the code + add expires header also when there is nothing to cache (set to the past) - this improved the usage with varnish

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2040 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
output-cache: do not cache if session was used somewhere in the code + add expires header also when there is nothing to cache (set to the past) - this improved the usage with varnish + always disabled when logged in at the admin ui - cookie in system-settings (pimcore_admin_sid) is not necessary anymore

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2041 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
install script: do not set "pimcore_admin_sid" in exclude-cookies (output-cache)

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2042 1f8fe7d8-47f0-464c-8d0a-336f4953ab05