Merge remote-tracking branch 'upstream/master'
Method signature getFromWebserviceImport() did not match parent::getFromWebserviceImport() - corrected.
This fixed an error related to http://www.pimcore.org/issues/browse/PIMCORE-1428
Merge pull request #27 from chluehr/master

Method signature getFromWebserviceImport() did not match parent::getFromWebserviceImport()

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1587 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Added fallback for the locale in the translateAdmin() method - without the fallback the translation is not working.

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1588 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
changed try/catch registry to if ::isREgistered() in TranslateAdmin

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1589 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
added getImage() method to Document_Tag_Image

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1590 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1552 - custom attributes on images

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1591 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
fixed problem with method exists on a non object, see also: http://www.pimcore.org/board/viewtopic.php?f=18&t=467

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1592 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1556 - Video Thumbnails: Caching problem

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1593 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1557 - Video: Allow to specify an asset image as preview image

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1594 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
changed try/catch language example in website_controller_action

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1595 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1560  - Pimcore/Model/Cache Notice, undefined Offset

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1596 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1547 - Short names not allowed in Tag & Snippet Management

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1597 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1538 - Creating Thumbnails not "on the fly" - CLI script to generate thumbnails

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1598 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1564 - Editor panel keeps reloading after removing/adding item to block and pressing backspace key

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1599 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
The class which is used for creating the page (Zend_Navigation_Page) is now configurable with the method setPageClass()
rtrim charlist added to pretty url check in route

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1600 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1525 - MultiHref in Block breaks editmode

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1601 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
fixed some ugly ternaries in getByPath in resource files

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1602 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
trimming / and space in pretty urls (in setter so that they are saved already correctly)

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