fixed htmlentities parameters to comply with PhP 5.3.x
Merge branch 'upstream/master'
removed a var_dump
Merge branch 'master' into vanboxel-theme