copy/paste issue

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3986 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
token auth support for deeplink into admin interface

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3987 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
bugfix asset: custom setting throws warning if custom setting key doesn't exist

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


git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3989 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1801 Website Settings: Allow same Key for different Sites

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3990 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1801 Website Settings: Allow same Key for different Sites

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3991 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1801 Website Settings: Allow same Key for different Sites

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3992 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1801 Website Settings: Allow same Key for different Sites

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

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3994 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
do not allow upload from php files into asset folder -> rename it to php.txt

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

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

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3997 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
build auto version (2994) ...

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