提交Crm图片压缩，删除以及修改alert框

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm.git

Conflicts:
	wchatplatform/Config/bootstrap/defined.php
	wchatplatform/Controllers/Company/testController.class.php
	wchatplatform/templates/User/locationcheck.tpl
crm礼品分页

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm.git