avoid invalid property id, javascript tidy
info -> debug
Merge branch 'master' into application-directories