update to support latest sdk/studio versions
Merge branch 'ws01' into ws02
Merge branch 'ws02' into ws03

Conflicts:
	build.gradle
Merge branch 'ws03' into ws04

Conflicts:
	build.gradle