SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - Define chromattic-nodetypes
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - coding and Unit Testing

Conflicts:
	component/core/src/main/java/org/exoplatform/social/core/storage/impl/RelationshipStorageImpl.java
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - improvement a bit
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - implement get number of activities and delete Activity
OC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - Space's activity
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - Space's activity
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - add streams node
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - add streams node(cont)
SOC-3430 | Fix UT failed

Conflicts:
	component/core/src/test/java/org/exoplatform/social/core/storage/ActivityStorageTest.java
	component/core/src/test/java/org/exoplatform/social/core/storage/impl/ActivityStorageImplTestCase.java
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - update activity and activityref
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - Fix number of max query on TestCase
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - streams for relationship

Conflicts:
	component/core/src/main/java/org/exoplatform/social/core/storage/impl/ActivityStorageImpl.java
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - post activity on space stream
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - like/unlike activity

Conflicts:
	component/core/src/main/java/org/exoplatform/social/core/storage/impl/StorageUtils.java
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - Asynchronous and Synchronous architecture
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - integration storage

Conflicts:
	component/core/src/main/java/org/exoplatform/social/core/storage/impl/AbstractStorage.java
	component/core/src/main/java/org/exoplatform/social/core/storage/impl/RelationshipStorageImpl.java
	component/core/src/main/java/org/exoplatform/social/core/storage/impl/StorageUtils.java
SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - Update number of JDBC require on TestCase

Conflicts:
	component/core/src/test/java/org/exoplatform/social/core/storage/ActivityStorageTest.java
SOC-3430 | Fix UT failed
SOC-3430 SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - data migration implementation
SOC-3430 SOC-3430 | PLF 4.0: slowness in UIActivitiesLoader init - Fixed UT failed