Merge branch 'master' of https://github.com/esadhar/onsegit2014

Signed-off-by: mengchou <monmo_aza@hotmail.com>
Merge branch 'master' of https://github.com/esadhar/onsegit2014
Merge branch 'master' of https://github.com/esadhar/onsegit2014