update
another update
Merge branch 'master' of https://github.com/miketihonchik/androiddev

Conflicts:
	.gitignore
	lenonhonor360/.classpath