Merge origin/master

Conflicts:
	pom.xml
	src/main/java/net/sumppen/whatsapi4j/WhatsApi.java
	src/main/java/net/sumppen/whatsapi4j/WhatsMediaUploader.java
	src/main/resources/countries.csv
	src/test/java/net/sumppen/whatsapi4j/WhatsApi4jTest.java