added 'watch' tasks for individual applications
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json