add
Merge branch 'master' of
https://github.com/EricleeCrystal/huoshi-backstage.git

Conflicts:
	src/main/java/com/huoshi/im/action/SyncLauncherAction.java