add json to pom change attributes to flash
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