Settings to Dev
Merge branch 'live' into dev

Conflicts:
	content/de/local.xml
TO Dev
add button image
Build Film Button
add film
change link
add template section app
modify film
Revert "modify film"

This reverts commit 8278279a0993a64429f9dc9689834244cc300439.
edit index template
edit home link to video
Fixed video overlay init
Changed index.tpl.php
Search for media
fixed maybe yui update problem
Add ID to video element
Bind ID gallery-video-data
Find inital stat for video
Changed Video Template