test
Merge branch 'master' of git@github.com:tclSmartwatch/tcl_smartwatch.git

Conflicts:
	Watch/AndroidManifest.xml
	Watch_orm/bin/watch_orm.jar