WIKI-697 change ajax auto save request to asynch
DOC-3061 PLF4 Wiki JAVA API: Backup changes from JAVA API of 4.0 to 4.1
Merge branch 'master' into feature/stabilization
Update version after merging master to feature/stabilization
WIKI-727: Cannot add/remove permission in Wiki Settings
WIKI-340: remove wiki\'s activity after delete of wiki page
Crowdin injections w40 (from 20130928 to 20131002) - Update translations
Crowdin injections w40 - Add Simplified Chinese translations
Crowdin injections w41 - Add Finnish files
Crowdin injections w41 - Update Turkish translations
Wiki-199 CLONE - [PLF 4] Wiki - Page Infos - Add related page Popup
ECMS-5751: Upldate version for the gatein portal
Mere feature/stabilization into master branch
ECMS-5751: Update version in pom.xml file after merge search-selector
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ

Conflicts:
	pom.xml
Fix conflicts after merge