Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/mr1/sensors/master' into mr1

git log --pretty=format:"%h %ad | %s%d [%an]" origin/abt/topic/gmin/l-dev/mr1/master..origin/abt/topic/gmin/l-dev/mr1/sensors/master:
  f233632 Thu Apr 16 12:44:36 2015 +0300 | Add "shorthand" field to sensor_catalog (origin/abt/topic/gmin/l-dev/mr1/sensors/master) [Adriana Reus]
  69ead50 Thu Apr 16 15:25:14 2015 +0300 | Clamp high proximity values to 1m [Adriana Reus]

git diff --stat origin/abt/topic/gmin/l-dev/mr1/master..HEAD:
  common.h      |  1 +
  description.c | 11 +++++++++++
  enumeration.c | 14 ++++++++++++++
  transform.c   | 17 ++++++++++++++---
  4 files changed, 40 insertions(+), 3 deletions(-)

Change-Id: I4d533f572ade8cc366ef8be6fe8f5911c629df66
Signed-off-by: Adriana Reus <adriana.reus@intel.com>