Merge pull request #1 from cnnic/master

menglunyang first updata
Merge pull request #2 from cnnic/master

try to download newest version
Merge pull request #3 from cnnic/master

update local code
add time calculate, update byte split

add time calculate, update byte split
Merge branch 'master' of https://github.com/menglunyang/niot into menglunyang-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/dao/RecoDao.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
	source/niot/src/cn/niot/rule/RuleFunction.java