init windows app
sync
updates to main
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edison/digitouch/main.js