changed konstructor of parser to file object
merge
Merge origin/master

Conflicts:
	src/main/java/org/editorconfig/netbeans/main/MainClass.java
	src/main/java/org/editorconfig/netbeans/parser/EditorConfigParser.java
merge