add json to pom change attributes to flash
changes
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash

Conflicts:
	SSEL/src/main/java/com/softserve/dao/TopicDao.java
	SSEL/src/main/resources/messages_ru.properties
	SSEL/src/main/resources/messages_ua.properties
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash
changes
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash

Conflicts:
	SSEL/src/main/resources/messages_ru.properties
	SSEL/src/main/resources/messages_ua.properties
change controller and design tables in view
add profile
merge
c1
lbase
lbase
commit f
Merge branch 'hash'

Conflicts:
	SSEL/src/main/webapp/WEB-INF/spring/social.xml
Merge branch 'master' into roma

Conflicts:
	SSEL/src/main/resources/messages_en.properties
	SSEL/src/main/resources/messages_ru.properties
	SSEL/src/main/resources/messages_ua.properties
	SSEL/src/main/webapp/WEB-INF/spring/social.xml
fix merge bugs