完成上传方法调用（待测试）
Merge branch 'dev' of github.com:Telcommunication/Telc into dev

Conflicts:
	SmartMemo/project.properties
	SmartMemo/src/com/telc/ui/other/newSettingFragment.java
Merge branch 'dev' of github.com:Telcommunication/Telc into dev

Conflicts:
	SmartMemo/project.properties
完成上传数据库文件~已测试通过