Merge branch 'master' of https://github.com/winark/Android.git

Conflicts:
	Java/src/Hello.java