Variable '$messages' was overwritten.
Merge pull request #1036 from linzongshu/develop

Added page for complete profile and fixed bug when compound fields confl...
Update persian translation
Added `GeoIp` service for IP geolocation support
Added `GeoIp` service for IP geolocation support
Merge pull request #1037 from voltan/develop

Update persian translation
Typo fix for GeoIp
Merge branch 'develop' of https://github.com/pi-engine/pi into develop
Fixes issue #1038: error messages were not translated
Merge pull request #1039 from linzongshu/develop

Fixed bug of compound element displaying
For Pi 2.4.0 release
Add composer
Merge branch 'develop' of https://github.com/pi-engine/pi into develop
Documentation updates
Merge pull request #1040 from linzongshu/develop

Fixed bug article cannot update and order of article
Update documentation
Update documentation
Update README-front-end.md
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	lib/Pi/Version/Version.php
Merge https://github.com/taiwen/pi into develop