IntelliJ fix
Merge branch 'master' of https://github.com/AleksandarJonovic/addressparser

Conflicts:
	.gitignore
	addressparser/src/ExceptionPackage/InvalidInputException.java
	addressparser/src/addressparser/Addressparser.java
	addressparser/src/addressparser/Parser.java
	addressparser/src/main/java/dk/itu/ExceptionPackage/InvalidInputException.java
	addressparser/src/main/java/dk/itu/addressparser/AddressParser.java
	addressparser/src/main/java/dk/itu/addressparser/Parser.java
	addressparser/src/test/java/dk/itu/addressparser/ParserTest.java
	addressparser/test/addressparser/ParserTest.java
	nbproject/project.properties
	src/main/java/dk/itu/ExceptionPackage/InvalidInputException.java
	src/main/java/dk/itu/addressparser/AddressParser.java
	src/main/java/dk/itu/addressparser/Parser.java
	src/test/java/dk/itu/addressparser/ParserTest.java
merge conflict
.