移除DI
Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartLife/.classpath
	SmartLife/AndroidManifest.xml
	SmartLife/gen/com/smartlife/activity/R.java