添加搜索
modify nav
Merge branch 'dev' of github.com:oyhk/free-blog into dev

Conflicts:
	src/main/webapp/views/include/navigation.html