Updated gitignore
Merge branch '3.5' into 4.0
Added javadoc for text
Merge commit 'd1b4370f5ba0f5bb9cebfa1802122bc1b06f9939' into 3.5