Refs #3096: make scala-ldap versionning follow the versionning of rudder
Change version of pom.xml from 2.4.2-SNAPSHOT to 2.4.2
Merge pull request #6 from ncharles/arc_3096/dev/3096_normalize_versionning_of_scala_ldap

Refs #3096: make scala-ldap versionning follow the versionning of rudder
Merging 2.4 into 2.5
Fixes #3156 : Add android support
Merge pull request #7 from VinceMacBuche/ust_3155/dev_3156/backport_Android

Ref #3155 : Add android support in inventory processor
Refs #3163: change pom version
Merging 2.4 to 2.5
Refs #3166: correct the artefact version on branch master
Fixes #3127: duplicated software entries in inventory leads to errors when trying to save the node
Merge pull request #8 from fanf/bug_3127/dev/duplicated_software_in_inventory_leads_to_errors

Fixes #3127: duplicated software entries in inventory leads to errors when trying to save the node
Merge branch 'branches/rudder/2.5'