name -> id
Merge branch 'master' of github.com:jhu-interaction/wallframe_apps

Conflicts:
	modulair_app_tron/menu.cfg