rename Admin::Base to Base
revice conflict
Merge branch 'develop' of https://github.com/rawhide/simpleblog into develop