Conflicts: config/routes.rb lib/redmine.rb
admin账户用户管理功能分离到/admin/users,软件创客功能与普通账户一致
Conflicts: app/views/softapplications/show.html.erb db/schema.rb