adc
server
Merge branch 'master' of github.com:cmingxu/pda_server

Conflicts:
	app/controllers/Weixiudans.java
	conf/application.conf
	server.iws
	tmp/bytecode/DEV/controllers.Application
	tmp/bytecode/DEV/controllers.Weixiudans
	tmp/bytecode/DEV/models.Danyuan
	tmp/bytecode/DEV/models.Weixiudan