Merge branch 'release/2.9.3' into develop
Add support for Java function documentation
Merge pull request #117 from skuroda/java_function_documentation

Add support for Java function documentation
Allow for PHP functions that return references.
Merge pull request #129 from KorvinSzanto/develop

Allow for PHP functions that return references.
Fixes #130 - regular block comments are completed with tab
Added Python 3 support for Sublime Text 3 compatibility
Fix for Issue #82 

Escaping string, so php variables wont removed after reparsing.
Add option to not have a param [description]
Merge pull request #143 from mbarany/description

Add option to not have a param [description]
Merge branch 'master' into develop
Adds optional `@method` tag (thanks to @maheshjag)
Merge remote-tracking branch 'ryrun/patch-1' into develop
grammar fix only
Merge remote-tracking branch 'lxe/st3-python3' into develop
Minor change: default value moved inside the get(), and set to 1 instead of 2
Haxe files get the ActionScript parser (thanks @shvfn)
Version bump and history
Merge branch 'release/2.10.0'
Changes from upstream