add smthg in master
Merge branch 'master' into new_branch

Conflicts:
	JavaParser/com/ttr/test/java/parser/fic2.txt