2
2
2
Merge remote-tracking branch 'origin/annotation' into local

Conflicts:
	controller/controller.iml
	dao/dao.iml
	dao/src/main/resources/hibernate.cfg.xml
	model/model.iml
	model/pom.xml
	news.ipr
	news.iws
	service/service.iml