Makes error messages translatable and adds php doc
Adds phpdoc
Merge remote-tracking branch 'origin/develop' into develop