Merge remote-tracking branch 'origin/dev'
Merge branch 'master' into dev
Merge remote-tracking branch 'origin/dev'
fixed menu name
Merge remote-tracking branch 'origin/dev'
added icon and lgoo
Merge remote-tracking branch 'origin/master' into dev