initial
Merge branch 'master' of github.com:Quinter/jh_adminDemo
initial commit