Merge branch 'master' into website-upstream
cdn und www
Update 26.05.2013
update from website