refactor for better use of enum
Merge branch 'master' of https://github.com/AleksandarJonovic/addressparser

Conflicts:
	src/addressparser/AddressMatcher.java