Updated bits related to webapps (closes #40)
Merge branch 'migrate_to_webapps' into appconfig-attribute

Conflicts:
	index.html