Update ChangeLog/manual
Update version
Rebuild
Merge branch 'develop'

Conflicts:
	ChangeLog
	doc/usermanual-ja.html
	doc/usermanual.html
Merge branch 'develop'

Conflicts:
	doc/usermanual-ja.html
	doc/usermanual.html
	doc/usermanual.txt
Merge branch 'develop'

Conflicts:
	install.rdf
Rebuild install.rdf
Merge branch 'develop'
Fix broken DECEFR
Update version
Merge branch 'declocator' into develop
Merge branch 'develop'
Merge branch 'master' into develop