Feature update and fix

Fixed array concatenate php error.
Merge branch 'master' of github.com:OS2web/os2web_acadre_esdh