Changed license files
Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop

Conflicts:
	safe/test/data/impact/buildings_inundated_entire_area.lic
	safe/test/data/impact/population_affected_district_jakarta.lic
	safe/test/data/impact/population_affected_entire_area.lic