增加获取Yum仓库包信息的API
add task_rpm configuration in app.conf
	modified:   routers/router.go
Merge branch 'master' of git.xiaojukeji.com:nieyanchao/servicetree

Conflicts:
	controllers/rpm.go
	main.go
	models/rpm.go
	routers/router.go
	tasks/rpm.go
Add conf and session dir
zhangzizhao
confict
Merge branch 'master' into 'dev'

Master

See merge request !6
for bug
for url
Merge branch 'm3' into 'm3'

M3

See merge request !8
fpr url
Merge branch 'next' into 'next'

Next

See merge request !7
Merge branch 'm3' into 'master'

M3

for url

See merge request !9
Merge branch 'm3' into dev
Merge branch 'next' into dev
add function: machine list
Merge branch 'master' into 'dev'

Master

增加功能：machine list

See merge request !10
change ui for view monitor
modify get tagsetid