modify roles setting
support user metrics
remove wrong commit
fixed miss <% --> <%=
support multiple user-metrics
deleted old style
Merge branch 'master' into add-service-role-setting

Conflicts:
	templates/default/mackerel-agent.conf.erb
Merge branch 'add-service-role-setting'