api18

Signed-off-by: Eric <doshajou@gmail.com>
Merge remote-tracking branch 'remotes/origin/develop' into develop
加入icon及LOGO

Signed-off-by: Eric <doshajou@gmail.com>