Merge pull request #1 from lgrcyanny/master

Update changes
Merge pull request #3 from lgrcyanny/master

update changes
add ignore
Merge branch 'master'

Conflicts:
.gitignore
Merge branch 'master'
multi-condition search
multi-condition search

title author publication year
Fix .gitignore conflit
fix bugs of simple search
Fix routes conflic
advanced literature search
statistics global view
statistics fix bug
Fix .gitignore conflicts

Conflicts:
	.gitignore
Merge pull request #8 from fengyibin713/master

ad-search & simple statistics