本地配置文件不上串
Merge branch 'master' of
https://github.com/NB-nlp-project/eventAnnouncements.git

Conflicts:
	app/controllers/UeditorController.java