added pseudo
Merge branch 'master' of github.com:garysheng/Clinker
add admin route
Merge branch 'jimmy'
Merge branch 'master' of github.com:garysheng/Clinker
Merge branch 'jimmy'
Merge branch 'master' into jimmy