Fix CollpaseFunctions for functions with headers over several lines

Example:

```
public function func
     (arg1,
     arg2)
 {

 }
```
Merge pull request #341 from Gama11/CollapseFunctionsFix

Fix CollpaseFunctions for functions with headers over several lines
Haxe: generate `package;` instead of `package ;` for new files
Improve readability
Merge pull request #342 from Gama11/HaxeEmptyPackageSpace

Haxe: generate `package;` instead of `package ;` for new files
Merge branch 'master' into tests