Merge branch 'master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Tue, 17 May 2016 01:33:08 +0000 (10:33 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Tue, 17 May 2016 01:34:25 +0000 (10:34 +0900)
update the lastest changes of master branch into notification-service branch

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

Trivial merge