update
Merge branch 'master' of https://github.com/cylong1016/NJULily

Conflicts:
	data/log/2014-12-28.log
	data/loginInfoTemp.ser