[UPDATE] fixed minor PHP 5.4 incompatibility, updated submodules
Merge branch 'development'
Merge branch 'master' into development