Merge branch 'php55mysqli' of https://github.com/andig/videodb into php55mysqli

Conflicts:
	core/functions.core.php
Merge pull request #32 from andig/php55mysqli

Merge branch 'php55mysqli' of https://github.com/andig/videodb into php5...