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

...5mysqli

Conflicts:
	core/functions.core.php