fixing some conflicts
Merge remote-tracking branch 'origin/master' into dev-dan

Conflicts:
	src/test/java/org/ocha/hdx/selenium/test/DatasetCreationTest.java
Merge pull request #7 from OCHA-DAP/dev-dan

fixing some conflicts