#JC-766 Reverted bodyText in TopicDto
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring
JC-766 Extracted PersistedObjectsFactory from ObjectsFactory.
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring
#JC-766 refactoring poll in topic
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring

Conflicts:
	jcommune-model/src/test/java/org/jtalks/jcommune/model/ObjectsFactory.java
	jcommune-model/src/test/java/org/jtalks/jcommune/model/dao/hibernate/BranchHibernateDaoTest.java
	jcommune-model/src/test/java/org/jtalks/jcommune/model/dao/search/hibernate/TopicHibernateSearchDaoTest.java
	jcommune-service/src/test/java/org/jtalks/jcommune/service/transactional/TransactionalTopicServiceTest.java
	jcommune-view/jcommune-web-controller/src/main/java/org/jtalks/jcommune/web/controller/TopicController.java
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring

Conflicts:
	jcommune-model/src/test/java/org/jtalks/jcommune/model/ObjectsFactory.java
	jcommune-model/src/test/java/org/jtalks/jcommune/model/dao/hibernate/BranchHibernateDaoTest.java
	jcommune-model/src/test/java/org/jtalks/jcommune/model/dao/search/hibernate/TopicHibernateSearchDaoTest.java
	jcommune-service/src/test/java/org/jtalks/jcommune/service/transactional/TransactionalTopicServiceTest.java
	jcommune-view/jcommune-web-controller/src/main/java/org/jtalks/jcommune/web/controller/TopicController.java
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring
Compile errors fixed.
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring

Conflicts:
	jcommune-view/jcommune-web-view/src/main/webapp/WEB-INF/jsp/editTopic.jsp
	jcommune-view/jcommune-web-view/src/main/webapp/WEB-INF/jsp/newTopic.jsp
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring
#JC-766 refactoring after code review
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring

Conflicts:
	jcommune-model/src/main/java/org/jtalks/jcommune/model/entity/Topic.java
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring

Conflicts:
	jcommune-model/src/main/java/org/jtalks/jcommune/model/entity/Topic.java
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring

Conflicts:
	jcommune-model/src/main/java/org/jtalks/jcommune/model/entity/Topic.java
	jcommune-service/src/main/java/org/jtalks/jcommune/service/TopicService.java
	jcommune-service/src/main/java/org/jtalks/jcommune/service/transactional/TransactionalTopicService.java
	jcommune-service/src/test/java/org/jtalks/jcommune/service/nontransactional/BBCodeServiceTest.java
	jcommune-service/src/test/java/org/jtalks/jcommune/service/transactional/TransactionalTopicServiceTest.java
	jcommune-view/jcommune-web-controller/src/main/java/org/jtalks/jcommune/web/controller/TopicController.java
	jcommune-view/jcommune-web-controller/src/test/java/org/jtalks/jcommune/web/controller/TopicControllerTest.java
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring

Conflicts:
	jcommune-service/src/main/java/org/jtalks/jcommune/service/TopicService.java
	jcommune-service/src/main/java/org/jtalks/jcommune/service/transactional/TransactionalTopicService.java
	jcommune-service/src/test/java/org/jtalks/jcommune/service/transactional/TransactionalTopicServiceTest.java
	jcommune-view/jcommune-web-controller/src/main/java/org/jtalks/jcommune/web/controller/TopicController.java
	jcommune-view/jcommune-web-controller/src/main/java/org/jtalks/jcommune/web/dto/TopicDto.java
	jcommune-view/jcommune-web-controller/src/test/java/org/jtalks/jcommune/web/controller/TopicControllerTest.java
	jcommune-view/jcommune-web-view/src/main/webapp/WEB-INF/jsp/editTopic.jsp
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring
Merge branch 'develop' of jtalks.org:jcommune into develop.topic_refactoring

Conflicts:
	jcommune-service/src/main/java/org/jtalks/jcommune/service/TopicService.java
	jcommune-service/src/main/java/org/jtalks/jcommune/service/transactional/TransactionalTopicService.java
	jcommune-service/src/test/java/org/jtalks/jcommune/service/transactional/TransactionalTopicServiceTest.java
	jcommune-view/jcommune-web-controller/src/main/java/org/jtalks/jcommune/web/controller/TopicController.java
	jcommune-view/jcommune-web-controller/src/main/java/org/jtalks/jcommune/web/dto/TopicDto.java
	jcommune-view/jcommune-web-controller/src/test/java/org/jtalks/jcommune/web/controller/TopicControllerTest.java
	jcommune-view/jcommune-web-view/src/main/webapp/WEB-INF/jsp/editTopic.jsp