前台添加了分类展示功能，
后台添加了搜索功能
Merge remote-tracking branch 'origin/master'

Conflicts:
	Application/Admin/View/Index/navbar.html
	Application/Home/Controller/SoftController.class.php
	Application/Runtime/Cache/Admin/32ec6c906c117a7c2bf504769276d87a.php
	Application/Runtime/Cache/Admin/b595b808c2ebeeeb0478ffc30bb4e87a.php
前台去掉了修改，删除软件的权限