删除重复配置
Merge branch 'master' of github.com:Filix/dngu

Conflicts:
	app/config/security.yml