Merge remote-tracking branch 'origin/parser' into parser

# Conflicts:
#	src/main/java/parser/FileVisitor.java
#	src/main/java/parser/RelationshipIdentifier.java
#	src/main/java/parser/tree/LeafNode.java
#	src/main/java/parser/tree/LeafNodeBuilder.java
#	src/main/java/parser/tree/PackageNode.java
#	src/test/java/parser/FileVisitorTest.java
#	src/test/java/parser/RelationshipIdentifierTest.java
#	src/test/resources/ParserTesting/InnerClassSample.java