Merge pull request #54 from lucknessbuaa/master

modify the details and bugs
i
Merge remote branch 'origin/master'

Conflicts:
	templates/org-grid.html