Merge branch 'devel/home/master' of ssh://slp-info.sec.samsung.net:29418/magnolia...