remove local demo_tray
Merge remote-tracking branch 'origin/master' into remove-demo-tray

Conflicts:
	local_app_manager/mock_apps/local_apps.installed
Merge remote-tracking branch 'refs/remotes/origin/master' into garaemon-remove-demo-tray
Merge pull request #22 from garaemon/remove-demo-tray

remove local demo_tray