first commit for user phoco (2)

Change-Id: Idec412027ac17f0e14daeddda32ec955747467e9
Signed-off-by: phoco <phoco@phoco.info>
Merge remote-tracking branch 'origin/master'