update develop log
Merge branch 'master' of git@github.com:weikipeng/develop-redmine.git

Conflicts:
	tool.txt