WIKI-234 Activity types for Wiki page
Merge remote-tracking branch 'origin/master' into feature/activity-type
WIKI-234 Activity types for Wiki page
Merge branch 'master' into feature/activity-type
Merge branch 'master' into feature/activity-type
Merge branch 'master' into feature/activity-type
Merge branch 'master' into feature/activity-type
Merge branch 'master' into feature/activity-type

Conflicts:
	wiki-service/src/main/java/org/exoplatform/wiki/service/WikiService.java
Merge remote-tracking branch 'origin/master' into feature/activity-type

Conflicts:
	wiki-service/src/main/java/org/exoplatform/wiki/service/WikiService.java
	wiki-service/src/main/java/org/exoplatform/wiki/service/impl/WikiServiceImpl.java
WIKI-337 Display 'View Changes' page from wiki's activity
Merge branch 'master' into feature/activity-type
WIKI-193 Fix bug exception when run wiki test
Merge branch 'master' into feature/activity-type (after 4.0.0-Beta1 release)
Merge remote-tracking branch 'origin/feature/activity-type' into feature/relooking