Merge branch 'master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Mon, 1 Aug 2016 01:02:32 +0000 (10:02 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Mon, 1 Aug 2016 01:02:41 +0000 (10:02 +0900)
Merged changes
1. https://gerrit.iotivity.org/gerrit/#/c/9801/
2. https://gerrit.iotivity.org/gerrit/#/c/9289/
3. https://gerrit.iotivity.org/gerrit/#/c/9839/
4. https://gerrit.iotivity.org/gerrit/#/c/9609/
5. https://gerrit.iotivity.org/gerrit/#/c/9601/

Change-Id: Ib56507b1830041fec457b1f8c718584166093c85
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Trivial merge