Merge branch 'release/20130829-2317'
fixed welt with hotfix
Merge branch 'hotfix/20130829-2321' into develop