clean and reorder
added comments
merged
removed test resourceList.xml
version upgraded
social type controller refactor
fixed entitytype bean
class names refactor