增加修改jar包
Add gen folder to gitignore.
Merge branch 'chende'
增加音乐同步
Merge branch 'chende'
Merge branch 'chenyan'
Merge branch 'master' of https://github.com/chainton/pdm-server.git
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmserver/service/SwitchService.java
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java