Merge branch 'develop'
fix view routing from controller
Merge branch 'develop'
add project list fields
Merge branch 'develop'
fix project list
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' of https://github.com/billyxs/local-hoster
Merge branch 'develop', remote-tracking branch 'origin'
Merge branch 'develop', remote-tracking branch 'origin'
Merge branch 'develop', remote-tracking branch 'origin'
Merge branch 'develop'
Merge branch 'master' of https://github.com/billyxs/local-hoster
add sorting by servername
Merge remote-tracking branch 'origin' into develop