3.5.13
Merge branch 'master' of https://github.com/jidesoft/jide-oss
Merge branch 'master' of https://github.com/jidesoft/jide-oss
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/jidesoft/jide-oss
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
3.6
Merge branch 'master' of https://github.com/jidesoft/jide-oss
Merge branch 'master' of https://github.com/jidesoft/jide-oss
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/jidesoft/jide-oss

Conflicts:
	build.properties
release 3.6.2