Fixes #3200: allows Android inventory to have their memory, video, network and drive listed
Merge pull request #9 from fanf/bug_3200/dev/process_android_inventory_mem_network_drive_video

Fixes #3200: allows Android inventory to have their memory, video, network and drive listed
Fixes #3203: assign negative slotnumber to inventory memory component missing information
Merge pull request #10 from fanf/bug_3203/dev/invalid_memory_slots_in_inventory_should_be_attributed_negative_value

Fixes #3203: assign negative slotnumber to inventory memory component missing information
Fixes #3202: change check on inventory from post to pre unmarshal, add a check about MACHINEID existence
Merge pull request #11 from fanf/bug_3202/dev/if_machineid_tag_is_missing_dummy_one_is_used

Fixes #3202: change check on inventory from post to pre unmarshal, add a check about MACHINEID existence
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Fixes #3202: change check on inventory from post to pre unmarshal, add a check about MACHINEID existence
Merge branch 'branches/rudder/2.5'
Update the POMs to prepare the Rudder 2.5.0 RC1 release
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Update the POMs to prepare the Rudder 2.5.0 RC1 release
Change version of pom.xml from 2.5.0-SNAPSHOT to 2.5.0
Change version of pom.xml from 2.5.0 to 2.5.1-SNAPSHOT
Updated the POM versions to 2.4.4
Revert "Updated the POM versions to 2.4.4"

This reverts commit a5645455323d74762d6cdafb4ef900bd980a3240.
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'

Conflicts:
	inventory-api/pom.xml
	inventory-fusion/pom.xml
	inventory-provisioning-core/pom.xml
	inventory-provisioning-web/pom.xml
	inventory-repository/pom.xml
	pom.xml
Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully

Conflicts:
	inventory-api/pom.xml
	inventory-fusion/pom.xml
	inventory-provisioning-core/pom.xml
	inventory-provisioning-web/pom.xml
	inventory-repository/pom.xml
	pom.xml
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully
Fixes #3242 : Upgrade ldap-inventory to Scala 2.10