Merge branch 'update_2.5' of https://github.com/nykhone/com_places into 148379

Conflicts:
	admin/models/_lieu.php
	admin/views/_lieu/tmpl/default_body.php
Merge branch 'update_2.5' of https://github.com/nykhone/com_places
version