Merge branch 'master' of https://github.com/lancehc/WatsonSID

Conflicts:
	wear/wear.iml
Merge branch 'master' of https://github.com/lancehc/WatsonSID