Merge branch 'php55mysqli'
Merge branch 'master' of https://github.com/andig/videodb
Merge branch 'master' of https://github.com/andig/videodb
fixed comment style