updated
Merge branch 'master' of https://github.com/hugozhu/rpi

Conflicts:
	.gitmodules