# Conflicts:
#	application/api_broker/service/UploadFileService.php
#	application/chat/controller/AppChat.php
#	application/model/AAgents.php
#	application/route.php
#	public/resource/js/pictureShow.js