Conflicts:
	wisenergy-common/wisenergy-common.iml
	wisenergy-mapper/wisenergy-mapper.iml
	wisenergy-model/wisenergy-model.iml
	wisenergy-parent.iml
	wisenergy-service/wisenergy-service.iml
	wisenergy-web-admin/wisenergy-web-admin.iml