Merge remote-tracking branch 'upstream/master'
A small fix to prevent PHP Notice

I enabled error_reporting(E_ALL) in my dev environment, and I'm getting a notice... this little change gets rid of it.
Fix German into English
added support for "forceEditInView" parameter

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1747 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
lowercase search for text column in translations

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1748 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
added memory consumption to every log entry

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1749 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
version cleanup: avoid infinite loop, reduce memory consumption

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1750 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
video thumbnails: width & height is now automatically the next highest even number (because of mp4 -> x264 which requires this)

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1751 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1641 - curl extension is not optional anymore

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1752 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1639 - Menu items not being marked as "active" when using pretty urls

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1753 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1636 - Double Negative in "Clear Cache" Message

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1754 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1632 - Change delimiter of wizard redirects to @ for better readability

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1755 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1631 - Redirects: add a helper in beginner mode for short URL's

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1756 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
added "postRenderAction" method to Area/Areablock which will be called if it is defined in the action.php Class

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1757 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1574 - When object tab is opened use class icon not default object icon

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1758 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1644 - HTML5 asset upload: droping files is only possible on the first level in the tree

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1759 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
fixed bug - only set html/text version if they aren't empty (otherwise a empty html message would be set and the text version wouldn't be shown in the mail program)

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1760 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
changed handling of "template" parameter in frontend action -> now if the template parameter is given it overrides the template path in the document

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1761 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
renderlet, snippet tag: logging exceptions as "error" and in debug mode display the exception message

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1762 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
corrected website-config cache tags (typo)

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