Change-Id: I307ecd64543cb84c0fb5fe214bf07c26c0b2686c
Change-Id: Idc77a132ef144756ec3bf421ef7f4e10b3067832
Change-Id: Icb69de9e4dd1b4e70efbf94880824d39eaefd6ea
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/BaBy_Care/config.py
Change-Id: I5a7c495e83361f0bc345f6e7e18d180d79b4a0e7