test master branch
Merge branch 'master' into test

Conflicts:
	git demo/src/helloworld.java

Change-Id: Ieee575a0e4a19b4b205db5b884c6c1bb263aadfa