修改数据库，穿件周期性提醒表；主界面大量改进，接近最终界面；登陆界面正在优化。
解决properties冲突
Merge branch 'dev' of https://github.com/Telcommunication/Telc into dev

Conflicts:
	SmartMemo/project.properties