b
ddd
Merge https://github.com/norrain/babybus

Conflicts:
	WebRoot/config.xml
	WebRoot/index.html
ssssssss
ddd
sss
Merge branch 'master' of https://github.com/norrain/babybus

Conflicts:
	WebRoot/config.xml
	WebRoot/index.html