i
Merge remote branch 'upstream/master' into current
update
Merge remote branch 'upstream/master' into current

Conflicts:
	assets/js/app.bundle.js
	templates/app/index.html
add search function
modify the Gulpfile.js
Merge pull request #14 from lucknessbuaa/master

add search function