admin theme update
new models and AR files for AR branch
updated conflicts
AR and models
Merge pull request #1 from HotaruCMS/temp

original AR files and models