Fix #21 without breaking #11 - v2
Foundation 4.3 upgrade
Merge branch 'master' of https://github.com/andig/videodb

Conflicts:
	lib/smarty/custom/function.html_image.php